Skip to content

Commit 1b8baf0

Browse files
Trottdanielleadams
authored andcommitted
build: remove legacy -J test.py option from Makefile/vcbuild
PR-URL: #40945 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 61b2e2e commit 1b8baf0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FIND ?= find
2323
ifdef JOBS
2424
PARALLEL_ARGS = -j $(JOBS)
2525
else
26-
PARALLEL_ARGS = -J
26+
PARALLEL_ARGS =
2727
endif
2828

2929
ifdef ENABLE_V8_TAP

vcbuild.bat

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
9292
if /i "%1"=="noetw" set noetw=1&goto arg-ok
9393
if /i "%1"=="ltcg" set ltcg=1&goto arg-ok
9494
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
95-
if /i "%1"=="test" set test_args=%test_args% -J %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
96-
if /i "%1"=="test-ci-native" set test_args=%test_args% %test_ci_args% -J -p tap --logfile test.tap %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set cctest_args=%cctest_args% --gtest_output=xml:cctest.junit.xml&goto arg-ok
97-
if /i "%1"=="test-ci-js" set test_args=%test_args% %test_ci_args% -J -p tap --logfile test.tap %CI_JS_SUITES%&set no_cctest=1&goto arg-ok
95+
if /i "%1"=="test" set test_args=%test_args% %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
96+
if /i "%1"=="test-ci-native" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set cctest_args=%cctest_args% --gtest_output=xml:cctest.junit.xml&goto arg-ok
97+
if /i "%1"=="test-ci-js" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %CI_JS_SUITES%&set no_cctest=1&goto arg-ok
9898
if /i "%1"=="build-addons" set build_addons=1&goto arg-ok
9999
if /i "%1"=="build-js-native-api-tests" set build_js_native_api_tests=1&goto arg-ok
100100
if /i "%1"=="build-node-api-tests" set build_node_api_tests=1&goto arg-ok
@@ -103,7 +103,7 @@ if /i "%1"=="test-doc" set test_args=%test_args% %CI_DOC%&set doc=1&&set li
103103
if /i "%1"=="test-js-native-api" set test_args=%test_args% js-native-api&set build_js_native_api_tests=1&goto arg-ok
104104
if /i "%1"=="test-node-api" set test_args=%test_args% node-api&set build_node_api_tests=1&goto arg-ok
105105
if /i "%1"=="test-benchmark" set test_args=%test_args% benchmark&goto arg-ok
106-
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
106+
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel&goto arg-ok
107107
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok
108108
if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
109109
if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
@@ -644,7 +644,7 @@ if defined test_node_inspect goto node-test-inspect
644644
goto node-tests
645645

646646
:node-check-deopts
647-
python tools\test.py --mode=release --check-deopts parallel sequential -J
647+
python tools\test.py --mode=release --check-deopts parallel sequential
648648
if defined test_node_inspect goto node-test-inspect
649649
goto node-tests
650650

0 commit comments

Comments
 (0)