Browse Source

win: fix test-child-process-exec-cwd

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
2908f323e1
  1. 7
      lib/child_process_uv.js
  2. 15
      test/simple/test-child-process-exec-cwd.js

7
lib/child_process_uv.js

@ -49,7 +49,12 @@ function createSocket(pipe, readable) {
exports.exec = function(command /*, options, callback */) {
var rest = Array.prototype.slice.call(arguments, 1);
var args = ['/bin/sh', ['-c', command]].concat(rest);
var args;
if (process.platform == 'win32') {
args = ['cmd.exe', ['/c', command]].concat(rest);
} else {
args = ['/bin/sh', ['-c', command]].concat(rest);
}
return exports.execFile.apply(this, args);
};

15
test/simple/test-child-process-exec-cwd.js

@ -26,7 +26,17 @@ var exec = require('child_process').exec;
var success_count = 0;
var error_count = 0;
var child = exec('pwd', {cwd: '/dev'}, function(err, stdout, stderr) {
var pwdcommand, dir;
if (process.platform == 'win32') {
pwdcommand = 'echo %cd%';
dir = 'c:\\windows';
} else {
pwdcommand = 'pwd';
dir = '/etc';
}
var child = exec(pwdcommand, {cwd: dir}, function(err, stdout, stderr) {
if (err) {
error_count++;
console.log('error!: ' + err.code);
@ -35,7 +45,8 @@ var child = exec('pwd', {cwd: '/dev'}, function(err, stdout, stderr) {
assert.equal(false, err.killed);
} else {
success_count++;
assert.equal(true, /^\/dev\b/.test(stdout));
console.log(stdout);
assert.ok(stdout.indexOf(dir) == 0);
}
});

Loading…
Cancel
Save