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]>

Author: seppevs

Makefile

@@ -196,7 +196,7 @@ test: all
 $(MAKE) build-addons-napi
 $(MAKE) cctest
 $(PYTHON) tools/test.py --mode=release -J \
-addons addons-napi doctool inspector known_issues message pseudo-tty parallel sequential
+ doctool inspector known_issues message pseudo-tty parallel sequential$(CI_NATIVE_SUITES)
 $(MAKE) lint
 
 test-parallel: all
@@ -349,7 +349,7 @@ test-ci: | clear-stalled build-addons build-addons-napi
  out/Release/cctest --gtest_output=tap:cctest.tap
 $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
  --mode=release --flaky-tests=$(FLAKY_TESTS)\
-$(TEST_CI_ARGS)$(CI_NATIVE_SUITES)$(CI_JS_SUITES)
+$(TEST_CI_ARGS)$(CI_JS_SUITES)$(CI_NATIVE_SUITES)
 # Clean up any leftover processes, error if found.
  ps awwx | grep Release/node | grep -v grep | cat
  @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`;\

vcbuild.bat

@@ -60,8 +60,8 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
 if /i "%1"=="noetw"setnoetw=1&goto arg-ok
 if /i "%1"=="noperfctr"setnoperfctr=1&goto arg-ok
 if /i "%1"=="licensertf"setlicensertf=1&goto arg-ok
-if /i "%1"=="test"settest_args=%test_args%addons addons-napi doctool known_issues message parallel sequential -J&set cpplint=1&set jslint=1&set build_addons=1&set build_addons_napi=1&goto arg-ok
-if /i "%1"=="test-ci"settest_args=%test_args%%test_ci_args% -p tap --logfile test.tap addons addons-napi doctool inspector known_issues message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&set build_addons_napi=1&goto arg-ok
+if /i "%1"=="test"settest_args=%test_args% doctool known_issues message parallel sequential addons addons-napi -J&set cpplint=1&set jslint=1&set build_addons=1&set build_addons_napi=1&goto arg-ok
+if /i "%1"=="test-ci"settest_args=%test_args%%test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons addons-napi&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&set build_addons_napi=1&goto arg-ok
 if /i "%1"=="test-addons"settest_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons-napi"settest_args=%test_args% addons-napi&set build_addons_napi=1&goto arg-ok
 if /i "%1"=="test-simple"settest_args=%test_args% sequential parallel -J&goto arg-ok