summaryrefslogtreecommitdiff
path: root/vcbuild.bat
diff options
context:
space:
mode:
authorGibson Fahnestock <gibfahn@gmail.com>2017-02-22 22:05:19 +0000
committerGibson Fahnestock <gibfahn@gmail.com>2017-10-19 12:06:04 +0100
commit532d8b24fd70a25cdb72ca12f3387f8ed29a91e7 (patch)
treea5032d8c32921c0c4abbbaaca93ae28f973737a7 /vcbuild.bat
parent7c079d12612ddebc68a24eb3c55efecd8b8a6186 (diff)
downloadnode-new-532d8b24fd70a25cdb72ca12f3387f8ed29a91e7.tar.gz
test: update test-npm to use test-npm-package.js
Deletes the old test-npm.sh script. PR-URL: https://github.com/nodejs/node/pull/11540 Refs: https://github.com/nodejs/node/pull/7867 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'vcbuild.bat')
-rw-r--r--vcbuild.bat8
1 files changed, 8 insertions, 0 deletions
diff --git a/vcbuild.bat b/vcbuild.bat
index 20555dec79..dde7faf1a2 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -89,6 +89,7 @@ if /i "%1"=="test-async-hooks" set test_args=%test_args% async-hooks&goto arg-o
if /i "%1"=="test-all" set test_args=%test_args% gc internet pummel %common_test_suites%&set build_testgc_addon=1&set lint_cpp=1&set lint_js=1&goto arg-ok
if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok
if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok
+if /i "%1"=="test-npm" set test_npm=1&goto arg-ok
if /i "%1"=="test-v8" set test_v8=1&set custom_v8_test=1&goto arg-ok
if /i "%1"=="test-v8-intl" set test_v8_intl=1&set custom_v8_test=1&goto arg-ok
if /i "%1"=="test-v8-benchmarks" set test_v8_benchmarks=1&set custom_v8_test=1&goto arg-ok
@@ -454,6 +455,13 @@ set USE_EMBEDDED_NODE_INSPECT=1
goto node-tests
:node-tests
+if not defined test_npm goto no-test-npm
+set npm_test_cmd="%node_exe%" tools\test-npm-package.js --install --logfile=test-npm.tap deps\npm test-node
+echo %npm_test_cmd%
+%npm_test_cmd%
+if errorlevel 1 goto exit
+:no-test-npm
+
if "%test_args%"=="" goto test-v8
if "%config%"=="Debug" set test_args=--mode=debug %test_args%
if "%config%"=="Release" set test_args=--mode=release %test_args%