summaryrefslogtreecommitdiff
path: root/vcbuild.bat
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-10-09 14:50:24 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-11-16 09:22:13 +0100
commit9ae81b9cb923520baa2d4e7a15ad21d2326f9bb8 (patch)
tree68f0148c30e011ad96302c9109c655d139db9061 /vcbuild.bat
parentb021403b2afdab0f5077b55aa27286c187119acd (diff)
downloadandroid-node-v8-9ae81b9cb923520baa2d4e7a15ad21d2326f9bb8.tar.gz
android-node-v8-9ae81b9cb923520baa2d4e7a15ad21d2326f9bb8.tar.bz2
android-node-v8-9ae81b9cb923520baa2d4e7a15ad21d2326f9bb8.zip
Revert "build: for --enable-static, run only cctest"
This reverts commit a36b5405029597ce09e15373a321c47930689c08. PR-URL: https://github.com/nodejs/node/pull/14986 Refs: https://github.com/nodejs/node/issues/14158 Refs: https://github.com/nodejs/node/pull/14892 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Diffstat (limited to 'vcbuild.bat')
-rw-r--r--vcbuild.bat6
1 files changed, 2 insertions, 4 deletions
diff --git a/vcbuild.bat b/vcbuild.bat
index d2683f9988..a765bcb439 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -110,7 +110,7 @@ if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok
if /i "%1"=="ignore-flaky" set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok
if /i "%1"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
if /i "%1"=="dll" set dll=1&goto arg-ok
-if /i "%1"=="static" set enable_static=1&goto arg-ok
+if /i "%1"=="static" set enable_static=1&goto arg-ok
if /i "%1"=="no-NODE-OPTIONS" set no_NODE_OPTIONS=1&goto arg-ok
if /i "%1"=="debug-http2" set debug_http2=1&goto arg-ok
if /i "%1"=="debug-nghttp2" set debug_nghttp2=1&goto arg-ok
@@ -465,9 +465,8 @@ if "%config%"=="Debug" set test_args=--mode=debug %test_args%
if "%config%"=="Release" set test_args=--mode=release %test_args%
echo running 'cctest %cctest_args%'
"%config%\cctest" %cctest_args%
-REM when building a static library there's no binary to run tests
-if defined enable_static goto test-v8
call :run-python tools\test.py %test_args%
+goto test-v8
:test-v8
if not defined custom_v8_test goto lint-cpp
@@ -520,7 +519,6 @@ set "localcppfilelist=%localcppfilelist% %1"
goto exit
:lint-js
-if defined enable_static goto exit
if defined lint_js_ci goto lint-js-ci
if not defined lint_js goto exit
if not exist tools\eslint goto no-lint