Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 11d1bd3

Browse files
joyeecheungaduh95
authored andcommitted
test: split test-embedding.js and run tests in parallel
Split the tests so that it's easier to isolate and debug issues, and we can run the test cases in parallel to speed up. Also add more comments about what they are testing. PR-URL: #61571 Backport-PR-URL: #65219 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e83648e commit 11d1bd3

16 files changed

Lines changed: 374 additions & 169 deletions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Tests that createRequire() works correctly with local fs in embedded environments.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
constfixtures=require('../common/fixtures');
8+
const{ spawnSyncAndExit }=require('../common/child_process');
9+
10+
constfixturePath=JSON.stringify(fixtures.path('exit.js'));
11+
spawnSyncAndExit(
12+
common.resolveBuiltBinary('embedtest'),
13+
[`require(${fixturePath})`,92],
14+
{
15+
status: 92,
16+
signal: null,
17+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
// Tests that createRequire() from embedded environments still cannot access internals.
4+
// The createRequire() call is in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndExit }=require('../common/child_process');
8+
9+
spawnSyncAndExit(
10+
common.resolveBuiltBinary('embedtest'),
11+
['require("lib/internal/test/binding")'],
12+
{
13+
status: 1,
14+
signal: null,
15+
});
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use strict';
2+
3+
// Tests node::ProcessInitializationFlags::kDisableNodeOptionsEnv works correctly.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
constos=require('os');
8+
9+
if(process.config.variables.node_without_node_options){
10+
common.skip('NODE_REPL_EXTERNAL_MODULE cannot be tested with --without-node-options');
11+
}
12+
13+
constembedtest=common.resolveBuiltBinary('embedtest');
14+
spawnSyncAndExit(
15+
embedtest,
16+
['require("os")'],
17+
{
18+
env: {
19+
...process.env,
20+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
21+
},
22+
},
23+
{
24+
status: 9,
25+
signal: null,
26+
stderr: `${embedtest}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv${os.EOL}`,
27+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// Tests that process.exitCode works correctly in embedded environments.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndExit }=require('../common/child_process');
7+
8+
spawnSyncAndExit(
9+
common.resolveBuiltBinary('embedtest'),
10+
['process.exitCode = 8'],
11+
{
12+
status: 8,
13+
signal: null,
14+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
// Tests node::LoadEnvironment() with main_script_source_utf8 works.
4+
5+
constcommon=require('../common');
6+
const{ spawnSyncAndAssert }=require('../common/child_process');
7+
8+
constembedtest=common.resolveBuiltBinary('embedtest');
9+
10+
spawnSyncAndAssert(
11+
embedtest,
12+
['console.log(42)'],
13+
{
14+
trim: true,
15+
stdout: '42',
16+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
// Test node::LoadEnvironment() works with non-ASCII source code. The variable
4+
// comes from embedtest.cc.
5+
6+
constcommon=require('../common');
7+
const{ spawnSyncAndAssert }=require('../common/child_process');
8+
9+
constembedtest=common.resolveBuiltBinary('embedtest');
10+
11+
spawnSyncAndAssert(
12+
embedtest,
13+
['console.log(embedVars.nΓΆn_ascΔ±Δ±)'],
14+
{
15+
trim: true,
16+
stdout: 'πŸ³οΈβ€πŸŒˆ',
17+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::EmbedderSnapshotData::FromFile() works correctly.
4+
// The snapshot is created in embedtest.cc.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --embedder-snapshot-as-file flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-as-file','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests snapshot support in embedded environments.
4+
// See embedtest.cc for the API usage.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the default flags.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
// Tests creating vm contexts after snapshot deserialization works
4+
// in embedded environments.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constfixtures=require('../common/fixtures');
9+
10+
const{
11+
spawnSyncAndAssert,
12+
spawnSyncAndExitWithoutError,
13+
}=require('../common/child_process');
14+
15+
constsnapshotFixture=fixtures.path('snapshot','create-vm.js');
16+
constembedtest=common.resolveBuiltBinary('embedtest');
17+
18+
constbuildSnapshotExecArgs=[
19+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
20+
'arg1','arg2',
21+
];
22+
constsnapshotBlobArgs=[
23+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
24+
];
25+
26+
construnSnapshotExecArgs=['arg3','arg4'];
27+
28+
tmpdir.refresh();
29+
30+
// Build the snapshot with the vm-creating code in serialized main funciton.
31+
spawnSyncAndExitWithoutError(
32+
embedtest,
33+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--embedder-snapshot-create'],
34+
{cwd: tmpdir.path});
35+
36+
// Run the snapshot that creates a vm context from the snapshot.
37+
spawnSyncAndAssert(
38+
embedtest,
39+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
40+
{cwd: tmpdir.path},
41+
{
42+
stdout: /value:42/,
43+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
'use strict';
2+
3+
// Tests node::SnapshotFlags::kWithoutCodeCache. See
4+
// embedtest.cc for more details.
5+
6+
constcommon=require('../common');
7+
consttmpdir=require('../common/tmpdir');
8+
constassert=require('assert');
9+
constfixtures=require('../common/fixtures');
10+
11+
const{
12+
spawnSyncAndAssert,
13+
spawnSyncAndExitWithoutError,
14+
}=require('../common/child_process');
15+
16+
constsnapshotFixture=fixtures.path('snapshot','echo-args.js');
17+
constembedtest=common.resolveBuiltBinary('embedtest');
18+
19+
constbuildSnapshotExecArgs=[
20+
`eval(require("fs").readFileSync(${JSON.stringify(snapshotFixture)}, "utf8"))`,
21+
'arg1','arg2',
22+
];
23+
constsnapshotBlobArgs=[
24+
'--embedder-snapshot-blob',tmpdir.resolve('embedder-snapshot.blob'),
25+
];
26+
27+
construnSnapshotExecArgs=['arg3','arg4'];
28+
29+
tmpdir.refresh();
30+
31+
// Build the snapshot with the --without-code-cache flag.
32+
spawnSyncAndExitWithoutError(
33+
embedtest,
34+
['--', ...buildSnapshotExecArgs, ...snapshotBlobArgs,'--without-code-cache','--embedder-snapshot-create'],
35+
{cwd: tmpdir.path});
36+
37+
// Run the snapshot and check the serialized and refreshed argv values.
38+
spawnSyncAndAssert(
39+
embedtest,
40+
['--', ...runSnapshotExecArgs, ...snapshotBlobArgs],
41+
{cwd: tmpdir.path},
42+
{
43+
stdout(output){
44+
assert.deepStrictEqual(JSON.parse(output),{
45+
originalArgv: [embedtest,'__node_anonymous_main', ...buildSnapshotExecArgs],
46+
currentArgv: [embedtest, ...runSnapshotExecArgs],
47+
});
48+
returntrue;
49+
},
50+
});

0 commit comments

Comments
Β (0)