diff options
author | claudiahdz <cghr1990@gmail.com> | 2019-09-03 17:51:04 -0500 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-09-17 18:51:21 -0700 |
commit | 17e420b23f5462db9f1951d98233fdaee889c721 (patch) | |
tree | c0f855138f734517aeba81000ebeac9d6e271563 /deps/npm/test/common-tap.js | |
parent | 7fa03b54c88f930d24f2f0e2ceb0e94dc5a6ad77 (diff) | |
download | android-node-v8-17e420b23f5462db9f1951d98233fdaee889c721.tar.gz android-node-v8-17e420b23f5462db9f1951d98233fdaee889c721.tar.bz2 android-node-v8-17e420b23f5462db9f1951d98233fdaee889c721.zip |
deps: update npm to 6.11.3
PR-URL: https://github.com/nodejs/node/pull/29430
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'deps/npm/test/common-tap.js')
-rw-r--r-- | deps/npm/test/common-tap.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/deps/npm/test/common-tap.js b/deps/npm/test/common-tap.js index 44b68d719d..83a61f4bdb 100644 --- a/deps/npm/test/common-tap.js +++ b/deps/npm/test/common-tap.js @@ -7,6 +7,11 @@ var readCmdShim = require('read-cmd-shim') var isWindows = require('../lib/utils/is-windows.js') var Bluebird = require('bluebird') +if (isWindows) { + var PATH = process.env.PATH ? 'PATH' : 'Path' + process.env[PATH] += ';C:\\Program Files\\Git\\mingw64\\libexec\\git-core' +} + // remove any git envs so that we don't mess with the main repo // when running git subprocesses in tests Object.keys(process.env).filter(k => /^GIT/.test(k)).forEach( @@ -103,6 +108,7 @@ ourenv.npm_config_globalconfig = exports.npm_config_globalconfig = configCommon. ourenv.npm_config_global_style = 'false' ourenv.npm_config_legacy_bundling = 'false' ourenv.npm_config_fetch_retries = '0' +ourenv.npm_config_update_notifier = 'false' ourenv.random_env_var = 'foo' // suppress warnings about using a prerelease version of node ourenv.npm_config_node_version = process.version.replace(/-.*$/, '') @@ -179,7 +185,7 @@ exports.makeGitRepo = function (params, cb) { var added = params.added || ['package.json'] var message = params.message || 'stub repo' - var opts = { cwd: root, env: { PATH: process.env.PATH } } + var opts = { cwd: root, env: { PATH: process.env.PATH || process.env.Path } } var commands = [ git.chainableExec(['init'], opts), git.chainableExec(['config', 'user.name', user], opts), |