Commit 21c1b84
test: decrease inconsistency in the common.js
1. `process.env['PROCESSOR_ARCHITEW6432']` ->
`process.env.PROCESSOR_ARCHITEW6432`.
2. `path.dirname(__filename)` -> `__dirname`.
3. `path.resolve(__dirname)` -> `__dirname`.
PR-URL: #7758
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>1 parent 76b8d81 commit 21c1b84
1 file changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,17 +8,17 @@ var child_process = require('child_process'); | |||
| 8 | 8 | const stream = require('stream'); | |
| 9 | 9 | const util = require('util'); | |
| 10 | 10 | ||
| 11 | - const testRoot = path.resolve(process.env.NODE_TEST_DIR || | ||
| 12 | - path.dirname(__filename)); | ||
| 11 | + const testRoot = process.env.NODE_TEST_DIR ? | ||
| 12 | + path.resolve(process.env.NODE_TEST_DIR) : __dirname; | ||
| 13 | 13 | ||
| 14 | - exports.testDir = path.dirname(__filename); | ||
| 14 | + exports.testDir = __dirname; | ||
| 15 | 15 | exports.fixturesDir = path.join(exports.testDir, 'fixtures'); | |
| 16 | 16 | exports.libDir = path.join(exports.testDir, '../lib'); | |
| 17 | 17 | exports.tmpDirName = 'tmp'; | |
| 18 | 18 | exports.PORT = +process.env.NODE_COMMON_PORT || 12346; | |
| 19 | 19 | exports.isWindows = process.platform === 'win32'; | |
| 20 | 20 | exports.isWOW64 = exports.isWindows && | |
| 21 | - (process.env['PROCESSOR_ARCHITEW6432'] !== undefined); | ||
| 21 | + (process.env.PROCESSOR_ARCHITEW6432 !== undefined); | ||
| 22 | 22 | exports.isAix = process.platform === 'aix'; | |
| 23 | 23 | exports.isLinuxPPCBE = (process.platform === 'linux') && | |
| 24 | 24 | (process.arch === 'ppc64') && | |
0 commit comments