From 553b052648ecaf533a928fbf9321ea4cbddff1a8 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 31 Mar 2023 15:48:59 +0200 Subject: [PATCH] tools: remove targets for individual test suites in `Makefile` PR-URL: https://github.com/nodejs/node/pull/46892 Reviewed-By: Richard Lau Reviewed-By: James M Snell Reviewed-By: Darshan Sen Reviewed-By: Rich Trott --- Makefile | 32 +++----------------------------- vcbuild.bat | 7 +------ 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 0be0659d372d2d..d3c692e4f63f5a 100644 --- a/Makefile +++ b/Makefile @@ -351,10 +351,6 @@ test-cov: all $(MAKE) cctest CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest -.PHONY: test-parallel -test-parallel: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel - .PHONY: test-valgrind test-valgrind: all $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --valgrind sequential parallel message @@ -583,16 +579,10 @@ run-ci: build-ci $(MAKE) test-ci -j1 .PHONY: test-release -test-release: test-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) - .PHONY: test-debug -test-debug: test-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug - -.PHONY: test-message -test-message: test-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) message +test-debug: BUILDTYPE_LOWER=debug +test-release test-debug: test-build + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) .PHONY: test-wpt test-wpt: all @@ -604,22 +594,10 @@ test-wpt-report: mkdir -p out/wpt WPT_REPORT=1 $(PYTHON) tools/test.py --shell $(NODE) $(PARALLEL_ARGS) wpt -.PHONY: test-simple -test-simple: | cctest # Depends on 'all'. - $(PYTHON) tools/test.py $(PARALLEL_ARGS) parallel sequential - -.PHONY: test-pummel -test-pummel: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) pummel - .PHONY: test-internet test-internet: all $(PYTHON) tools/test.py $(PARALLEL_ARGS) internet -.PHONY: test-benchmark -test-benchmark: | bench-addons-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) benchmark - .PHONY: test-tick-processor test-tick-processor: all $(PYTHON) tools/test.py $(PARALLEL_ARGS) tick-processor @@ -687,10 +665,6 @@ test-addons-clean: $(MAKE) test-js-native-api-clean $(MAKE) test-node-api-clean -.PHONY: test-async-hooks -test-async-hooks: - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks - .PHONY: test-with-async-hooks test-with-async-hooks: $(MAKE) build-addons diff --git a/vcbuild.bat b/vcbuild.bat index a4dd3a28d5c98b..4053338df2d6e8 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -105,14 +105,9 @@ if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1& 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 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 if /i "%1"=="test-node-api" set test_args=%test_args% node-api&set build_node_api_tests=1&goto arg-ok -if /i "%1"=="test-benchmark" set test_args=%test_args% benchmark&goto arg-ok -if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel&goto arg-ok -if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok -if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok -if /i "%1"=="test-async-hooks" set test_args=%test_args% async-hooks&goto arg-ok 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 if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok @@ -745,7 +740,7 @@ set exit_code=1 goto exit :help -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] +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] echo Examples: echo vcbuild.bat : builds release build echo vcbuild.bat debug : builds debug build