daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process_uv: fix test/simple/test-child-process-env

pull/23362/head
Ryan Dahl 2011-07-31 17:51:41 -07:00
parent ef767a152b
commit 624dd38d89
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -238,6 +238,7 @@ UVTEST += simple/test-child-process-exit-code
UVTEST += simple/test-child-process-buffering
UVTEST += simple/test-child-process-exec-cwd
UVTEST += simple/test-child-process-cwd
UVTEST += simple/test-child-process-env
test-uv: all

10
lib/child_process_uv.js
View File

@ -172,10 +172,18 @@ var spawn = exports.spawn = function(file, args, options) {
var args = args ? args.slice(0) : [];
args.unshift(file);
var env = (options ? options.env : null) || process.env;
var envPairs = [];
var keys = Object.keys(env);
for (var key in env) {
envPairs.push(key + '=' + env[key]);
}
child.spawn({
file: file,
args: args,
cwd: options ? options.cwd : null
cwd: options ? options.cwd : null,
envPairs: envPairs
});
return child;

2
src/process_wrap.cc
View File

@ -113,7 +113,7 @@ class ProcessWrap : public HandleWrap {
}
// options.env
Local<Value> env_v = js_options->Get(String::New("env"));
Local<Value> env_v = js_options->Get(String::New("envPairs"));
if (!env_v.IsEmpty() && env_v->IsArray()) {
Local<Array> env = Local<Array>::Cast(env_v);
int envc = env->Length();