Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-10-22 01:50:19 +0300
committerKat Marchán <kzm@sykosomatic.org>2016-10-25 02:18:22 +0300
commitbc68176cd0b6bb06805411a3c28aceea1ec99ce5 (patch)
tree851b183c02bd1f36a30795e3c8b0fcce6c55bb22 /scripts
parenteff46dd498ed007bfa77ab7782040a3a828b852d (diff)
maketest: Make the test boilerplate prefer our config over env
Credit: @iarna
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/maketest4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/maketest b/scripts/maketest
index b4f674393..a71cadbc8 100755
--- a/scripts/maketest
+++ b/scripts/maketest
@@ -40,13 +40,13 @@ var tmpdir = path.join(basedir, 'tmp')
var conf = {
cwd: testdir,
- env: extend({
+ env: extend(extend({}, process.env), {
npm_config_cache: cachedir,
npm_config_tmp: tmpdir,
npm_config_prefix: globaldir,
npm_config_registry: common.registry,
npm_config_loglevel: 'warn'
- }, process.env)
+ })
}
var server