1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "build: for --enable-static, run only cctest"

Browse Source 
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>
This commit is contained in:
Daniel Bevenius 2017-10-09 14:50:24 +02:00
parent b021403b2a
commit 9ae81b9cb9
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -205,10 +205,6 @@ v8:
tools/make-v8.sh tools/make-v8.sh
$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS) $(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
ifeq ($(NODE_TARGET_TYPE),static_library)
test: all
$(MAKE) cctest
else
test: all test: all
$(MAKE) -s build-addons $(MAKE) -s build-addons
$(MAKE) -s build-addons-napi $(MAKE) -s build-addons-napi
@ -221,7 +217,6 @@ test: all
$(CI_NATIVE_SUITES) \ $(CI_NATIVE_SUITES) \
$(CI_DOC) \ $(CI_DOC) \
known_issues known_issues
endif
# For a quick test, does not run linter or build doc # For a quick test, does not run linter or build doc
test-only: all test-only: all

2
configure vendored
View File

@ -1461,8 +1461,6 @@ config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release', 'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_XCODE': str(int(options.use_xcode or 0)), 'USE_XCODE': str(int(options.use_xcode or 0)),
'PYTHON': sys.executable, 'PYTHON': sys.executable,
'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \
else '',
} }
if options.prefix: if options.prefix:

6
vcbuild.bat
View File

@ -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"=="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"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
if /i "%1"=="dll" set dll=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"=="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-http2" set debug_http2=1&goto arg-ok
if /i "%1"=="debug-nghttp2" set debug_nghttp2=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% if "%config%"=="Release" set test_args=--mode=release %test_args%
echo running 'cctest %cctest_args%' echo running 'cctest %cctest_args%'
"%config%\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% call :run-python tools\test.py %test_args%
goto test-v8
:test-v8 :test-v8
if not defined custom_v8_test goto lint-cpp if not defined custom_v8_test goto lint-cpp
@ -520,7 +519,6 @@ set "localcppfilelist=%localcppfilelist% %1"
goto exit goto exit
:lint-js :lint-js
if defined enable_static goto exit
if defined lint_js_ci goto lint-js-ci if defined lint_js_ci goto lint-js-ci
if not defined lint_js goto exit if not defined lint_js goto exit
if not exist tools\eslint goto no-lint if not exist tools\eslint goto no-lint