diff options
author | Beth Griggs <Bethany.Griggs@uk.ibm.com> | 2017-08-14 12:12:49 +0100 |
---|---|---|
committer | Tobias Nießen <tniessen@tnie.de> | 2017-08-16 17:16:27 +0200 |
commit | c879c9a5c6481df313bc90529588de44cf1e55f0 (patch) | |
tree | 346743c5885c991ee4a4ab702ff9fdc01e21797e /test/parallel/test-tls-env-extra-ca.js | |
parent | 2710616d53be2e53649739db2d7decfcf28611f8 (diff) | |
download | android-node-v8-c879c9a5c6481df313bc90529588de44cf1e55f0.tar.gz android-node-v8-c879c9a5c6481df313bc90529588de44cf1e55f0.tar.bz2 android-node-v8-c879c9a5c6481df313bc90529588de44cf1e55f0.zip |
test: preserve env in test cases
Allows env vars to be passed through to child processes. This is needed
for things like NODE_TEST_DIR or LD_LIBRARY_PATH if testing the shared
library.
PR-URL: https://github.com/nodejs/node/pull/14822
Refs: https://github.com/nodejs/node/pull/13390
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/parallel/test-tls-env-extra-ca.js')
-rw-r--r-- | test/parallel/test-tls-env-extra-ca.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/parallel/test-tls-env-extra-ca.js b/test/parallel/test-tls-env-extra-ca.js index f55167c53c..80d9cc9ec3 100644 --- a/test/parallel/test-tls-env-extra-ca.js +++ b/test/parallel/test-tls-env-extra-ca.js @@ -32,11 +32,11 @@ const server = tls.createServer(options, common.mustCall(function(s) { s.end('bye'); server.close(); })).listen(0, common.mustCall(function() { - const env = { + const env = Object.assign({}, process.env, { CHILD: 'yes', PORT: this.address().port, NODE_EXTRA_CA_CERTS: fixtures.path('keys', 'ca1-cert.pem') - }; + }); fork(__filename, { env: env }).on('exit', common.mustCall(function(status) { assert.strictEqual(status, 0, 'client did not succeed in connecting'); |