Skip to content

Commit 2d857ed

Browse files
TrottMylesBorins
authored andcommitted
build: remove duplicate async-hooks and known_issues test runs
The `default` test suite in `test.py` includes `async-hooks` and `known_issues`. Our current setup results in those test suites being run twice during each CI run. Remove the duplication. PR-URL: #17912 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent a702fcb commit 2d857ed

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Makefile

+4-10
Original file line numberDiff line numberDiff line change
@@ -218,22 +218,18 @@ test: all ## Default test target. Runs default tests, linters, and builds docs.
218218
$(MAKE) -s lint
219219
$(MAKE) -s cctest
220220
$(PYTHON) tools/test.py --mode=release -J \
221-
$(CI_ASYNC_HOOKS) \
222221
$(CI_JS_SUITES) \
223222
$(CI_NATIVE_SUITES) \
224-
$(CI_DOC) \
225-
known_issues
223+
$(CI_DOC)
226224

227225
# For a quick test, does not run linter or build doc
228226
test-only: all
229227
$(MAKE) build-addons
230228
$(MAKE) build-addons-napi
231229
$(MAKE) cctest
232230
$(PYTHON) tools/test.py --mode=release -J \
233-
$(CI_ASYNC_HOOKS) \
234231
$(CI_JS_SUITES) \
235-
$(CI_NATIVE_SUITES) \
236-
known_issues
232+
$(CI_NATIVE_SUITES)
237233

238234
test-cov: all
239235
$(MAKE) build-addons
@@ -386,7 +382,6 @@ test-all-valgrind: test-build
386382
$(PYTHON) tools/test.py --mode=debug,release --valgrind
387383

388384
CI_NATIVE_SUITES ?= addons addons-napi
389-
CI_ASYNC_HOOKS := async-hooks
390385
CI_JS_SUITES ?= default
391386
CI_DOC := doctool
392387

@@ -401,7 +396,7 @@ test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp
401396
test-ci-js: | clear-stalled
402397
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
403398
--mode=release --flaky-tests=$(FLAKY_TESTS) \
404-
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) known_issues
399+
$(TEST_CI_ARGS) $(CI_JS_SUITES)
405400
# Clean up any leftover processes, error if found.
406401
ps awwx | grep Release/node | grep -v grep | cat
407402
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
@@ -414,8 +409,7 @@ test-ci: | clear-stalled build-addons build-addons-napi doc-only
414409
out/Release/cctest --gtest_output=tap:cctest.tap
415410
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
416411
--mode=release --flaky-tests=$(FLAKY_TESTS) \
417-
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) \
418-
$(CI_DOC) known_issues
412+
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
419413
# Clean up any leftover processes, error if found.
420414
ps awwx | grep Release/node | grep -v grep | cat
421415
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \

vcbuild.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set enable_static=
4444
set build_addons_napi=
4545
set test_node_inspect=
4646
set test_check_deopts=
47-
set js_test_suites=default async-hooks known_issues
47+
set js_test_suites=default
4848
set v8_test_options=
4949
set v8_build_options=
5050
set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"

0 commit comments

Comments
 (0)