From 7592615aaa1eb7a18dca1b9ab70865bbfd99a80d Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 16 Apr 2013 09:51:56 +0200 Subject: [PATCH] test: preserve process.env after test-init exec When LD_LIBRARY_PATH is overriden for custom builds we need to preserve it for child processes. To be sure we preserve whole environment of parent process and just add TEST_INIT variable to it. --- test/simple/test-init.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/simple/test-init.js b/test/simple/test-init.js index da059846d1..139df7f58b 100644 --- a/test/simple/test-init.js +++ b/test/simple/test-init.js @@ -34,12 +34,16 @@ // being in the test folder process.chdir(__dirname); - child.exec(process.execPath + ' test-init', {env: {'TEST_INIT': 1}}, + // slow but simple + var envCopy = JSON.parse(JSON.stringify(process.env)); + envCopy.TEST_INIT = 1; + + child.exec(process.execPath + ' test-init', {env: envCopy}, function(err, stdout, stderr) { assert.equal(stdout, 'Loaded successfully!', '`node test-init` failed!'); }); - child.exec(process.execPath + ' test-init.js', {env: {'TEST_INIT': 1}}, + child.exec(process.execPath + ' test-init.js', {env: envCopy}, function(err, stdout, stderr) { assert.equal(stdout, 'Loaded successfully!', '`node test-init.js` failed!'); @@ -48,7 +52,7 @@ // test-init-index is in fixtures dir as requested by ry, so go there process.chdir(common.fixturesDir); - child.exec(process.execPath + ' test-init-index', {env: {'TEST_INIT': 1}}, + child.exec(process.execPath + ' test-init-index', {env: envCopy}, function(err, stdout, stderr) { assert.equal(stdout, 'Loaded successfully!', '`node test-init-index failed!'); @@ -59,7 +63,7 @@ // expected in node process.chdir(common.fixturesDir + '/test-init-native/'); - child.exec(process.execPath + ' fs', {env: {'TEST_INIT': 1}}, + child.exec(process.execPath + ' fs', {env: envCopy}, function(err, stdout, stderr) { assert.equal(stdout, 'fs loaded successfully', '`node fs` failed!');