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

danbev · MylesBorins · commit 2eec94489deb · 2017-12-11T15:52:38.000-05:00
This reverts commit a36b540. PR-URL: #14986 Refs: #14158 Refs: #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>
diff --git a/Makefile b/Makefile
@@ -205,10 +205,6 @@ v8:
 	tools/make-v8.sh
 	$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
 
-ifeq ($(NODE_TARGET_TYPE),static_library)
-test: all
-	$(MAKE) cctest
-else
 test: all
 	$(MAKE) -s build-addons
 	$(MAKE) -s build-addons-napi
@@ -221,7 +217,6 @@ test: all
 		$(CI_NATIVE_SUITES) \
 		$(CI_DOC) \
 		known_issues
-endif
 
 # For a quick test, does not run linter or build doc
 test-only: all
diff --git a/configure b/configure
@@ -1461,8 +1461,6 @@ config = {
   'BUILDTYPE': 'Debug' if options.debug else 'Release',
   'USE_XCODE': str(int(options.use_xcode or 0)),
   'PYTHON': sys.executable,
-  'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \
-      else '',
 }
 
 if options.prefix:
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1461,8 +1461,6 @@ config = {`
`1461`	`1461`	`'BUILDTYPE': 'Debug' if options.debug else 'Release',`
`1462`	`1462`	`'USE_XCODE': str(int(options.use_xcode or 0)),`
`1463`	`1463`	`'PYTHON': sys.executable,`
`1464`		`- 'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \`
`1465`		`- else '',`
`1466`	`1464`	`}`
`1467`	`1465`
`1468`	`1466`	`if options.prefix:`