From 88d05aa43b5654c016e345d0b6f463e84fd857bf Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 10 Oct 2017 17:42:46 -0400 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/16132 Fixes: https://github.com/nodejs/node/issues/16129 Fixes: https://github.com/nodejs/build/issues/910 Reviewed-By: Gibson Fahnestock Reviewed-By: Benjamin E. Coe Reviewed-By: Michael Dawson --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 56e7caef833..84b4e2c35c3 100644 --- a/Makefile +++ b/Makefile @@ -347,7 +347,7 @@ test-all: test-build test/gc/build/Release/binding.node test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind -CI_NATIVE_SUITES := addons addons-napi +CI_NATIVE_SUITES ?= addons addons-napi CI_ASYNC_HOOKS := async-hooks CI_JS_SUITES ?= default @@ -362,7 +362,7 @@ test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp test-ci-js: | clear-stalled $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=release --flaky-tests=$(FLAKY_TESTS) \ - $(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) known_issues + $(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) known_issues # 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}'`; \ @@ -375,7 +375,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_ASYNC_HOOKS) $(CI_JS_SUITES) known_issues + $(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) known_issues # 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}'`; \