test: fix more tests that fail when path contains a space

aduh95 · targos · commit b885f0583c77 · 2024-10-04T10:20:28.000+02:00
PR-URL: #55088 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
diff --git a/test/parallel/test-child-process-execfile.js b/test/parallel/test-child-process-execfile.js
@@ -10,7 +10,7 @@ const os = require('os');
 
 const fixture = fixtures.path('exit.js');
 const echoFixture = fixtures.path('echo.js');
-const execOpts = { encoding: 'utf8', shell: true };
+const execOpts = { encoding: 'utf8', shell: true, env: { ...process.env, NODE: process.execPath, FIXTURE: fixture } };
 
 {
   execFile(
@@ -46,7 +46,12 @@ const execOpts = { encoding: 'utf8', shell: true };
 
 {
   // Verify the shell option works properly
-  execFile(process.execPath, [fixture, 0], execOpts, common.mustSucceed());
+  execFile(
+    `"${common.isWindows ? execOpts.env.NODE : '$NODE'}"`,
+    [`"${common.isWindows ? execOpts.env.FIXTURE : '$FIXTURE'}"`, 0],
+    execOpts,
+    common.mustSucceed(),
+  );
 }
 
 {
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
@@ -6,14 +6,16 @@ if (process.config.variables.node_without_node_options)
 // Test options specified by env variable.
 
 const assert = require('assert');
+const path = require('path');
 const exec = require('child_process').execFile;
 const { Worker } = require('worker_threads');
 
+const fixtures = require('../common/fixtures');
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 
-const printA = require.resolve('../fixtures/printA.js');
-const printSpaceA = require.resolve('../fixtures/print A.js');
+const printA = path.relative(tmpdir.path, fixtures.path('printA.js'));
+const printSpaceA = path.relative(tmpdir.path, fixtures.path('print A.js'));
 
 expectNoWorker(` -r ${printA} `, 'A\nB\n');
 expectNoWorker(`-r ${printA}`, 'A\nB\n');
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
@@ -22,8 +22,8 @@ const { spawnSync } = require('child_process');
                           [ '--use-largepages=xyzzy', '-p', '42' ]);
   assert.strictEqual(child.status, 9);
   assert.strictEqual(child.signal, null);
-  assert.strictEqual(child.stderr.toString().match(/\S+/g).slice(1).join(' '),
-                     'invalid value for --use-largepages');
+  assert.match(child.stderr.toString().trim(),
+               /invalid value for --use-largepages$/);
 }
 
 // TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
diff --git a/test/pseudo-tty/test-repl-external-module.js b/test/pseudo-tty/test-repl-external-module.js
@@ -2,9 +2,9 @@
 
 require('../common');
 const fixtures = require('../common/fixtures');
-const { execSync } = require('child_process');
+const { execFileSync } = require('child_process');
 
-execSync(process.execPath, {
+execFileSync(process.execPath, {
   encoding: 'utf8',
   stdio: 'inherit',
   env: {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ const os = require('os');`
`10`	`10`
`11`	`11`	`const fixture = fixtures.path('exit.js');`
`12`	`12`	`const echoFixture = fixtures.path('echo.js');`
`13`		`-const execOpts = { encoding: 'utf8', shell: true };`
	`13`	`+const execOpts = { encoding: 'utf8', shell: true, env: { ...process.env, NODE: process.execPath, FIXTURE: fixture } };`
`14`	`14`
`15`	`15`	`{`
`16`	`16`	`execFile(`
`@@ -46,7 +46,12 @@ const execOpts = { encoding: 'utf8', shell: true };`
`46`	`46`
`47`	`47`	`{`
`48`	`48`	`// Verify the shell option works properly`
`49`		`- execFile(process.execPath, [fixture, 0], execOpts, common.mustSucceed());`
	`49`	`+ execFile(`
	`50`	+ `"${common.isWindows ? execOpts.env.NODE : '$NODE'}"`,
	`51`	+ [`"${common.isWindows ? execOpts.env.FIXTURE : '$FIXTURE'}"`, 0],
	`52`	`+ execOpts,`
	`53`	`+ common.mustSucceed(),`
	`54`	`+ );`
`50`	`55`	`}`
`51`	`56`
`52`	`57`	`{`