Skip to content

Commit

Permalink
chore: combine parallel/test-v8-stats v8 patches (#37801)
Browse files Browse the repository at this point in the history
* chore: combine parallel/test-v8-stats v8 patches

* chore: update patches

---------

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
  • Loading branch information
codebytere and patchup[bot] committed Apr 4, 2023
1 parent 4ba5723 commit 0b4ef2b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 26 deletions.
1 change: 0 additions & 1 deletion patches/node/.patches
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ v8_api_advance_api_deprecation.patch
fixup_for_error_declaration_shadows_a_local_variable.patch
fix_parallel_test-v8-stats.patch
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
heap_remove_allocationspace_map_space_enum_constant.patch
api_pass_oomdetails_to_oomerrorcallback.patch
fix_expose_lookupandcompile_with_parameters.patch
fix_prevent_changing_functiontemplateinfo_after_publish.patch
Expand Down
19 changes: 14 additions & 5 deletions patches/node/fix_parallel_test-v8-stats.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@ From: Jeremy Rose <japthorp@slack-corp.com>
Date: Thu, 29 Sep 2022 16:30:17 -0700
Subject: fix parallel/test-v8-stats

new heap spaces were added in v8, this updates the expectations to
match. node should eventually have this too once they roll up the newer
v8.
Refs https://chromium-review.googlesource.com/c/v8/v8/+/3967841
Refs https://chromium-review.googlesource.com/c/v8/v8/+/3892950.

Heap spaces were added/removed in v8 - this patch updates test expectations
to match.

This patch can be removed when Electron updates to Node.js v20.

diff --git a/test/parallel/test-v8-stats.js b/test/parallel/test-v8-stats.js
index 2eaa3c5b0609149271afb85d7ecc33272e0ada2e..3af7ea1e4a4598dc4125ff78e426d6dc6a025c66 100644
index 2eaa3c5b0609149271afb85d7ecc33272e0ada2e..83b375bd3c5b5dbd5189d48ad560580883ac91f6 100644
--- a/test/parallel/test-v8-stats.js
+++ b/test/parallel/test-v8-stats.js
@@ -47,6 +47,8 @@ const expectedHeapSpaces = [
@@ -42,11 +42,12 @@ const expectedHeapSpaces = [
'code_large_object_space',
'code_space',
'large_object_space',
- 'map_space',
'new_large_object_space',
'new_space',
'old_space',
'read_only_space',
Expand Down

This file was deleted.

0 comments on commit 0b4ef2b

Please sign in to comment.