1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gyp: fix test runner

Browse Source
This commit is contained in:
Ryan Dahl 2011-08-04 17:13:37 -07:00
parent a979ab9d99
commit 43d7cfca18
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gyp/all.gyp → build/node.gyp
View File

@ -159,6 +159,17 @@
}, },
'actions': [ 'actions': [
# {
# 'action_name': 'test',
# 'inputs': [],
# 'outputs': [],
# 'action': [
# 'python',
# '../tools/test.py',
# ],
# },
{ {
'action_name': 'node_js2c', 'action_name': 'node_js2c',

6
test/simple/test-executable-path.js
View File

@ -26,15 +26,15 @@ var path = require('path');
var isDebug = (process.version.indexOf('debug') >= 0); var isDebug = (process.version.indexOf('debug') >= 0);
var debugPath = path.normalize(path.join(__dirname, '..', '..', var debugPath = path.normalize(path.join(__dirname, '..', '..',
'build', 'debug', 'node_g')); 'out', 'Debug', 'node'));
var defaultPath = path.normalize(path.join(__dirname, '..', '..', var defaultPath = path.normalize(path.join(__dirname, '..', '..',
'build', 'default', 'node')); 'out', 'Release', 'node'));
console.error('debugPath: ' + debugPath); console.error('debugPath: ' + debugPath);
console.error('defaultPath: ' + defaultPath); console.error('defaultPath: ' + defaultPath);
console.error('process.execPath: ' + process.execPath); console.error('process.execPath: ' + process.execPath);
if (/node_g$/.test(process.execPath)) { if (isDebug) {
assert.ok(process.execPath.indexOf(debugPath) == 0); assert.ok(process.execPath.indexOf(debugPath) == 0);
} else { } else {
assert.ok(process.execPath.indexOf(defaultPath) == 0); assert.ok(process.execPath.indexOf(defaultPath) == 0);

4
tools/test.py
View File

@ -663,9 +663,9 @@ class Context(object):
def GetVm(self, mode): def GetVm(self, mode):
if mode == 'debug': if mode == 'debug':
name = 'build/debug/node_g' name = 'out/Debug/node'
else: else:
name = 'build/default/node' name = 'out/Release/node'
if utils.IsWindows() and not name.endswith('.exe'): if utils.IsWindows() and not name.endswith('.exe'):
name = os.path.abspath(name + '.exe') name = os.path.abspath(name + '.exe')