fixup! test: add escapePathsFromShellCommand util

Author: aduh95

test/abort/test-abort-fatal-error.js

@@ -28,10 +28,11 @@ const assert = require('assert');
 const exec = require('child_process').exec;
 
 const cmdline =
-  'ulimit -c 0; "$NODE" --max-old-space-size=16 --max-semi-space-size=4' +
-  ' -e "a = []; for (i = 0; i < 1e9; i++) { a.push({}) }"';
+  common.escapePOSIXShell`ulimit -c 0; "${
+    process.execPath
+  }" --max-old-space-size=16 --max-semi-space-size=4 -e "a = []; for (i = 0; i < 1e9; i++) { a.push({}) }"`;
 
-exec(cmdline, { env: { NODE: process.execPath } }, common.mustCall((err, stdout, stderr) => {
+exec(...cmdline, common.mustCall((err, stdout, stderr) => {
   if (err?.code !== 134 && err?.signal !== 'SIGABRT') {
     console.log({ err, stdout, stderr });
     assert.fail(err?.message);

test/async-hooks/test-callback-error.js

@@ -62,12 +62,12 @@ assert.ok(!arg);
   let program = process.execPath;
   let args = [
     '--abort-on-uncaught-exception', __filename, 'test_callback_abort' ];
-  const options = { encoding: 'utf8' };
+  let options = { encoding: 'utf8' };
   if (!common.isWindows) {
-    program = `ulimit -c 0 && exec "$NODE" ${args[0]} "$FILE" ${args[2]}`;
+    [program, options] = common.escapePOSIXShell`ulimit -c 0 && exec "${program}" ${args[0]} "${args[1]}" ${args[2]}`;
     args = [];
     options.shell = true;
-    options.env = { NODE: process.execPath, FILE: __filename };
+    options.encoding = 'utf8';
   }
   const child = spawnSync(program, args, options);
   if (common.isWindows) {

test/common/index.js

@@ -249,15 +249,12 @@ const PIPE = (() => {
 // `$node --abort-on-uncaught-exception $file child`
 // the process aborts.
 function childShouldThrowAndAbort() {
-  let testCmd = '';
-  if (!isWindows) {
-    // Do not create core files, as it can take a lot of disk space on
-    // continuous testing and developers' machines
-    testCmd += 'ulimit -c 0 && ';
-  }
-  testCmd += '"$NODE" --abort-on-uncaught-exception ';
-  testCmd += '"$FILE" child';
-  const child = exec(testCmd, { env: { NODE: process.argv[0], FILE: process.argv[1] } });
+  // Do not create core files, as it can take a lot of disk space on
+  // continuous testing and developers' machines
+  const uclimit = isWindows ?
+    '' :
+    'ulimit -c 0 && ';
+  const child = exec(...escapePOSIXShell`${uclimit}"${process.argv[0]}" --abort-on-uncaught-exception "${process.argv[1]}" child`);
   child.on('exit', function onExit(exitCode, signal) {
     const errMsg = 'Test should have aborted ' +
                    `but instead exited with exit code ${exitCode}` +

test/fixtures/snapshot/child-process-sync.js

@@ -8,7 +8,7 @@ const {
 function spawn() {
   const { spawnSync, execFileSync, execSync } = require('child_process');
   spawnSync(process.execPath, [ __filename, 'spawnSync' ], { stdio: 'inherit' });
-  execSync(`"$NODE" "$FILE" "execSync"`, { stdio: 'inherit', env: { NODE: process.execPath, FILE: __filename } });
+  execSync(`"$NODE" "$FILE" "execSync"`, { stdio: 'inherit', env: { ...process.env, NODE: process.execPath, FILE: __filename } });
   execFileSync(process.execPath, [ __filename, 'execFileSync' ], { stdio: 'inherit' });
 }
 

test/parallel/test-child-process-bad-stdio.js

@@ -27,8 +27,8 @@ ChildProcess.prototype.spawn = function() {
 };
 
 function createChild(options, callback) {
-  const cmd = '"$NODE" "$FILE" child';
-  options = { ...options, env: { ...options.env, NODE: process.execPath, FILE: __filename } };
+  const [cmd, opts] = common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`;
+  options = { ...options, env: { ...opts.env, ...options.env } };
 
   return cp.exec(cmd, options, common.mustCall(callback));
 }

test/parallel/test-child-process-exec-encoding.js

@@ -13,8 +13,8 @@ if (process.argv[2] === 'child') {
   const expectedStdout = `${stdoutData}\n`;
   const expectedStderr = `${stderrData}\n`;
   function run(options, callback) {
-    const cmd = '"$NODE" "$FILE" child';
-    options = { ...options, env: { ...options.env, NODE: process.execPath, FILE: __filename } };
+    const [cmd, opts] = common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`;
+    options = { ...options, env: { ...opts.env, ...options.env } };
 
     cp.exec(cmd, options, common.mustSucceed((stdout, stderr) => {
       callback(stdout, stderr);

test/parallel/test-child-process-exec-std-encoding.js

@@ -12,9 +12,7 @@ if (process.argv[2] === 'child') {
   console.log(stdoutData);
   console.error(stderrData);
 } else {
-  const cmd = '"$NODE" "$FILE" child';
-  const env = { NODE: process.execPath, FILE: __filename };
-  const child = cp.exec(cmd, { env }, common.mustSucceed((stdout, stderr) => {
+  const child = cp.exec(...common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`, common.mustSucceed((stdout, stderr) => {
     assert.strictEqual(stdout, expectedStdout);
     assert.strictEqual(stderr, expectedStderr);
   }));

test/parallel/test-child-process-exec-timeout-expire.js

@@ -18,10 +18,10 @@ if (process.argv[2] === 'child') {
   return;
 }
 
-const cmd = '"$NODE" "$FILE" child';
+const [cmd, opts] = common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`;
 
 cp.exec(cmd, {
-  env: { NODE: process.execPath, FILE: __filename },
+  ...opts,
   timeout: kExpiringParentTimer,
 }, common.mustCall((err, stdout, stderr) => {
   console.log('[stdout]', stdout.trim());

test/parallel/test-child-process-exec-timeout-kill.js

@@ -18,11 +18,11 @@ if (process.argv[2] === 'child') {
   return;
 }
 
-const cmd = '"$NODE" "$FILE" child';
+const [cmd, opts] = common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`;
 
 // Test with a different kill signal.
 cp.exec(cmd, {
-  env: { NODE: process.execPath, FILE: __filename },
+  ...opts,
   timeout: kExpiringParentTimer,
   killSignal: 'SIGKILL'
 }, common.mustCall((err, stdout, stderr) => {

test/parallel/test-child-process-exec-timeout-not-expired.js

@@ -22,11 +22,11 @@ if (process.argv[2] === 'child') {
   return;
 }
 
-const cmd = '"$NODE" "$FILE" child';
+const [cmd, opts] = common.escapePOSIXShell`"${process.execPath}" "${__filename}" child`;
 
 cp.exec(cmd, {
-  env: { NODE: process.execPath, FILE: __filename },
-  timeout: kTimeoutNotSupposedToExpire
+  ...opts,
+  timeout: kTimeoutNotSupposedToExpire,
 }, common.mustSucceed((stdout, stderr) => {
   assert.strictEqual(stdout.trim(), 'child stdout');
   assert.strictEqual(stderr.trim(), 'child stderr');