Skip to content

Commit ce2eeb9

Browse files
refacktargos
authored andcommitted
build: restore mistakenly dropped suites
suites dropped during the last commit by a typo restore $(CI_JS_SUITES) to test-ci-js restore $(CI_NATIVE_SUITES) for `test-ci` and var assignment tweak PR-URL: #16132 Fixes: #16129 Fixes: nodejs/build#910 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Benjamin E. Coe <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 4fdb9f5 commit ce2eeb9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ test-all: test-build test/gc/build/Release/binding.node
347347
test-all-valgrind: test-build
348348
$(PYTHON) tools/test.py --mode=debug,release --valgrind
349349

350-
CI_NATIVE_SUITES := addons addons-napi
350+
CI_NATIVE_SUITES ?= addons addons-napi
351351
CI_ASYNC_HOOKS := async-hooks
352352
CI_JS_SUITES ?= default
353353

@@ -362,7 +362,7 @@ test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp
362362
test-ci-js: | clear-stalled
363363
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
364364
--mode=release --flaky-tests=$(FLAKY_TESTS) \
365-
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) known_issues
365+
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) known_issues
366366
# Clean up any leftover processes, error if found.
367367
ps awwx | grep Release/node | grep -v grep | cat
368368
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
@@ -375,7 +375,7 @@ test-ci: | clear-stalled build-addons build-addons-napi
375375
out/Release/cctest --gtest_output=tap:cctest.tap
376376
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
377377
--mode=release --flaky-tests=$(FLAKY_TESTS) \
378-
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) known_issues
378+
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) known_issues
379379
# Clean up any leftover processes, error if found.
380380
ps awwx | grep Release/node | grep -v grep | cat
381381
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \

0 commit comments

Comments
 (0)