Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2eec944

Browse filesBrowse files
danbevMylesBorins
authored andcommitted
Revert "build: for --enable-static, run only cctest"
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>
1 parent 70060ee commit 2eec944
Copy full SHA for 2eec944

File tree

Expand file treeCollapse file tree

3 files changed

+2
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+2
-11
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ v8:
205205
tools/make-v8.sh
206206
$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
207207

208-
ifeq ($(NODE_TARGET_TYPE),static_library)
209-
test: all
210-
$(MAKE) cctest
211-
else
212208
test: all
213209
$(MAKE) -s build-addons
214210
$(MAKE) -s build-addons-napi
@@ -221,7 +217,6 @@ test: all
221217
$(CI_NATIVE_SUITES) \
222218
$(CI_DOC) \
223219
known_issues
224-
endif
225220

226221
# For a quick test, does not run linter or build doc
227222
test-only: all
Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,8 +1461,6 @@ config = {
14611461
'BUILDTYPE': 'Debug' if options.debug else 'Release',
14621462
'USE_XCODE': str(int(options.use_xcode or 0)),
14631463
'PYTHON': sys.executable,
1464-
'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \
1465-
else '',
14661464
}
14671465

14681466
if options.prefix:
Collapse file

‎vcbuild.bat‎

Copy file name to clipboardExpand all lines: vcbuild.bat
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok
110110
if /i "%1"=="ignore-flaky" set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok
111111
if /i "%1"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
112112
if /i "%1"=="dll" set dll=1&goto arg-ok
113-
if /i "%1"=="static" set enable_static=1&goto arg-ok
113+
if /i "%1"=="static" set enable_static=1&goto arg-ok
114114
if /i "%1"=="no-NODE-OPTIONS" set no_NODE_OPTIONS=1&goto arg-ok
115115
if /i "%1"=="debug-http2" set debug_http2=1&goto arg-ok
116116
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%
465465
if "%config%"=="Release" set test_args=--mode=release %test_args%
466466
echo running 'cctest %cctest_args%'
467467
"%config%\cctest" %cctest_args%
468-
REM when building a static library there's no binary to run tests
469-
if defined enable_static goto test-v8
470468
call :run-python tools\test.py %test_args%
469+
goto test-v8
471470

472471
:test-v8
473472
if not defined custom_v8_test goto lint-cpp
@@ -520,7 +519,6 @@ set "localcppfilelist=%localcppfilelist% %1"
520519
goto exit
521520

522521
:lint-js
523-
if defined enable_static goto exit
524522
if defined lint_js_ci goto lint-js-ci
525523
if not defined lint_js goto exit
526524
if not exist tools\eslint goto no-lint

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.