summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSebastian Van Sande <sebastian@vansande.org>2017-03-27 11:30:58 +0200
committerRefael Ackermann <refack@gmail.com>2017-04-13 18:34:29 -0400
commit3d2181c5f089091a6844266f7819485c0869aab2 (patch)
tree7bd782ec41c9321da517363ffb3e35db70a8c038 /Makefile
parent40b6cf241e1b383abe7a0476a604979a123d17d4 (diff)
downloadandroid-node-v8-3d2181c5f089091a6844266f7819485c0869aab2.tar.gz
android-node-v8-3d2181c5f089091a6844266f7819485c0869aab2.tar.bz2
android-node-v8-3d2181c5f089091a6844266f7819485c0869aab2.zip
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: https://github.com/nodejs/node/issues/12031 PR-URL: https://github.com/nodejs/node/pull/12062 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cfbe9424d0..9d27292aa6 100644
--- a/Makefile
+++ b/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}'`; \