diff --git a/test/common.js b/test/common.js index 0a7e0f82b3..668d98b108 100644 --- a/test/common.js +++ b/test/common.js @@ -27,6 +27,7 @@ exports.isSunOS = process.platform === 'sunos'; exports.isFreeBSD = process.platform === 'freebsd'; exports.enoughTestMem = os.totalmem() > 0x20000000; /* 512MB */ +exports.rootDir = exports.isWindows ? 'c:\\' : '/'; function rimrafSync(p) { try { diff --git a/test/parallel/test-child-process-cwd.js b/test/parallel/test-child-process-cwd.js index f13da684fb..108538629e 100644 --- a/test/parallel/test-child-process-cwd.js +++ b/test/parallel/test-child-process-cwd.js @@ -36,12 +36,11 @@ function testCwd(options, forCode, forData) { } // Assume these exist, and 'pwd' gives us the right directory back +testCwd({cwd: common.rootDir}, 0, common.rootDir); if (common.isWindows) { testCwd({cwd: process.env.windir}, 0, process.env.windir); - testCwd({cwd: 'c:\\'}, 0, 'c:\\'); } else { testCwd({cwd: '/dev'}, 0, '/dev'); - testCwd({cwd: '/'}, 0, '/'); } // Assume does-not-exist doesn't exist, expect exitCode=-1 and errno=ENOENT diff --git a/test/parallel/test-child-process-spawnsync.js b/test/parallel/test-child-process-spawnsync.js index 3602b7e953..1952620507 100644 --- a/test/parallel/test-child-process-spawnsync.js +++ b/test/parallel/test-child-process-spawnsync.js @@ -20,7 +20,7 @@ assert.deepEqual(ret_err.spawnargs, ['bar']); { // Test the cwd option - const cwd = common.isWindows ? 'c:\\' : '/'; + const cwd = common.rootDir; const response = common.spawnSyncPwd({cwd}); assert.strictEqual(response.stdout.toString().trim(), cwd); diff --git a/test/sequential/test-child-process-execsync.js b/test/sequential/test-child-process-execsync.js index 6c7df10ffb..359799dd45 100644 --- a/test/sequential/test-child-process-execsync.js +++ b/test/sequential/test-child-process-execsync.js @@ -61,20 +61,13 @@ assert.strictEqual(ret, msg + '\n', 'execFileSync encoding result should match'); // Verify that the cwd option works - GH #7824 -(function() { - var response; - var cwd; - - if (common.isWindows) { - cwd = 'c:\\'; - response = execSync('echo %cd%', {cwd: cwd}); - } else { - cwd = '/'; - response = execSync('pwd', {cwd: cwd}); - } +{ + const cwd = common.rootDir; + const cmd = common.isWindows ? 'echo %cd%' : 'pwd'; + const response = execSync(cmd, {cwd}); assert.strictEqual(response.toString().trim(), cwd); -})(); +} // Verify that stderr is not accessed when stdio = 'ignore' - GH #7966 (function() {