Skip to content

Commit 553b052

Browse files
authored
tools: remove targets for individual test suites in Makefile
PR-URL: nodejs#46892 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 0517e19 commit 553b052

File tree

2 files changed

+4
-35
lines changed

2 files changed

+4
-35
lines changed

Makefile

+3-29
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,6 @@ test-cov: all
351351
$(MAKE) cctest
352352
CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest
353353

354-
.PHONY: test-parallel
355-
test-parallel: all
356-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel
357-
358354
.PHONY: test-valgrind
359355
test-valgrind: all
360356
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --valgrind sequential parallel message
@@ -583,16 +579,10 @@ run-ci: build-ci
583579
$(MAKE) test-ci -j1
584580

585581
.PHONY: test-release
586-
test-release: test-build
587-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER)
588-
589582
.PHONY: test-debug
590-
test-debug: test-build
591-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug
592-
593-
.PHONY: test-message
594-
test-message: test-build
595-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) message
583+
test-debug: BUILDTYPE_LOWER=debug
584+
test-release test-debug: test-build
585+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER)
596586

597587
.PHONY: test-wpt
598588
test-wpt: all
@@ -604,22 +594,10 @@ test-wpt-report:
604594
mkdir -p out/wpt
605595
WPT_REPORT=1 $(PYTHON) tools/test.py --shell $(NODE) $(PARALLEL_ARGS) wpt
606596

607-
.PHONY: test-simple
608-
test-simple: | cctest # Depends on 'all'.
609-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) parallel sequential
610-
611-
.PHONY: test-pummel
612-
test-pummel: all
613-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) pummel
614-
615597
.PHONY: test-internet
616598
test-internet: all
617599
$(PYTHON) tools/test.py $(PARALLEL_ARGS) internet
618600

619-
.PHONY: test-benchmark
620-
test-benchmark: | bench-addons-build
621-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) benchmark
622-
623601
.PHONY: test-tick-processor
624602
test-tick-processor: all
625603
$(PYTHON) tools/test.py $(PARALLEL_ARGS) tick-processor
@@ -687,10 +665,6 @@ test-addons-clean:
687665
$(MAKE) test-js-native-api-clean
688666
$(MAKE) test-node-api-clean
689667

690-
.PHONY: test-async-hooks
691-
test-async-hooks:
692-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks
693-
694668
.PHONY: test-with-async-hooks
695669
test-with-async-hooks:
696670
$(MAKE) build-addons

vcbuild.bat

+1-6
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,9 @@ if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&
105105
if /i "%1"=="test-doc" set test_args=%test_args% %CI_DOC%&set doc=1&&set lint_js=1&set lint_md=1&goto arg-ok
106106
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
107107
if /i "%1"=="test-node-api" set test_args=%test_args% node-api&set build_node_api_tests=1&goto arg-ok
108-
if /i "%1"=="test-benchmark" set test_args=%test_args% benchmark&goto arg-ok
109-
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel&goto arg-ok
110-
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok
111108
if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
112109
if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
113-
if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok
114110
if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok
115-
if /i "%1"=="test-async-hooks" set test_args=%test_args% async-hooks&goto arg-ok
116111
if /i "%1"=="test-all" set test_args=%test_args% gc internet pummel %common_test_suites%&set lint_cpp=1&set lint_js=1&goto arg-ok
117112
if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok
118113
if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok
@@ -745,7 +740,7 @@ set exit_code=1
745740
goto exit
746741

747742
:help
748-
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
743+
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
749744
echo Examples:
750745
echo vcbuild.bat : builds release build
751746
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)