Skip to content

Commit f359682

Browse files
seppevsgibfahn
authored andcommitted
test: run the addon tests last
Running the addon tests before the parallel, sequential, etc. tests can be a problem if there is a bug in node that prevents the addon tests from running properly. When the addon tests fail for any reason, then none of the other tests (e.g. parallel, etc.) are executed. Running the addon tests last fixes this. Refs: #12031 PR-URL: #12062 Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 01cb518 commit f359682

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ test: all
122122
$(MAKE) build-addons
123123
$(MAKE) cctest
124124
$(PYTHON) tools/test.py --mode=release -J \
125-
addons doctool inspector known_issues message pseudo-tty parallel sequential
125+
doctool inspector known_issues message pseudo-tty parallel sequential addons
126126
$(MAKE) lint
127127

128128
test-parallel: all
@@ -232,7 +232,7 @@ test-ci: | clear-stalled build-addons
232232
out/Release/cctest --gtest_output=tap:cctest.tap
233233
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
234234
--mode=release --flaky-tests=$(FLAKY_TESTS) \
235-
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)
235+
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES)
236236
# Clean up any leftover processes, error if found.
237237
ps awwx | grep Release/node | grep -v grep | cat
238238
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \

vcbuild.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
5656
if /i "%1"=="noetw" set noetw=1&goto arg-ok
5757
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
5858
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
59-
if /i "%1"=="test" set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
60-
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool inspector known_issues message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
59+
if /i "%1"=="test" set test_args=%test_args% doctool known_issues message parallel sequential addons -J&set jslint=1&set build_addons=1&goto arg-ok
60+
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
6161
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
6262
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
6363
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok

0 commit comments

Comments
 (0)