maketest: Make the test boilerplate prefer our config over env

Credit: @iarna
npm · Oct 24, 2016 · bc68176 · bc68176
1 parent eff46dd
commit bc68176
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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