From 7a980086c84852049606e81c3715ecd076b74a3a Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Sat, 28 Apr 2018 00:21:46 +0800 Subject: [PATCH] build: always use BUILDTYPE binary to run JS tests PR-URL: https://github.com/nodejs/node/pull/20362 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 02d97b633d87d6..e74f29b84dde6b 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ v8: .PHONY: jstest jstest: build-addons build-addons-napi ## Runs addon tests and JS tests - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES) @@ -269,13 +269,13 @@ test-cov: all $(MAKE) lint test-parallel: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release parallel + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel test-valgrind: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --valgrind sequential parallel message + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --valgrind sequential parallel message test-check-deopts: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --check-deopts parallel sequential + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential benchmark/misc/function_call/build/Release/binding.node: all \ benchmark/misc/function_call/binding.cc \ @@ -398,7 +398,7 @@ clear-stalled: .PHONY: test-gc test-gc: all test/gc/build/Release/binding.node - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release gc + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) gc .PHONY: test-gc-clean test-gc-clean: @@ -425,7 +425,7 @@ CI_DOC := doctool test-ci-native: LOGLEVEL := info test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ - --mode=release --flaky-tests=$(FLAKY_TESTS) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) .PHONY: test-ci-js @@ -433,7 +433,7 @@ test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp # Related CI job: node-test-commit-arm-fanned test-ci-js: | clear-stalled $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ - --mode=release --flaky-tests=$(FLAKY_TESTS) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) # Clean up any leftover processes, error if found. ps awwx | grep Release/node | grep -v grep | cat @@ -448,7 +448,7 @@ test-ci: LOGLEVEL := info test-ci: | clear-stalled build-addons build-addons-napi doc-only 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) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) # Clean up any leftover processes, error if found. ps awwx | grep Release/node | grep -v grep | cat @@ -475,7 +475,7 @@ run-ci: build-ci $(MAKE) test-ci test-release: test-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test-debug: test-build $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug @@ -521,7 +521,7 @@ test-npm-publish: $(NODE_EXE) .PHONY: test-addons-napi test-addons-napi: test-build-addons-napi - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons-napi + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons-napi .PHONY: test-addons-napi-clean test-addons-napi-clean: @@ -530,7 +530,7 @@ test-addons-napi-clean: .PHONY: test-addons test-addons: test-build test-addons-napi - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons .PHONY: test-addons-clean test-addons-clean: @@ -541,19 +541,19 @@ test-addons-clean: test-timers: $(MAKE) --directory=tools faketime - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release timers + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) timers test-timers-clean: $(MAKE) --directory=tools clean test-async-hooks: - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release async-hooks + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks test-with-async-hooks: $(MAKE) build-addons $(MAKE) build-addons-napi $(MAKE) cctest - NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \ + NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES)