diff options
| author | Rich Trott <rtrott@gmail.com> | 2020-07-20 07:13:13 +0300 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2020-07-22 20:17:07 +0300 |
| commit | 3caa2e256bd403e0fb06cfbefc0338462f2c60d9 (patch) | |
| tree | 0da2454fee6a08dc6298a7c79387ae741bf173e6 /Makefile | |
| parent | 90ee98a7d14829a6c7c6fc6e1700e58c3c25b92d (diff) | |
build: do not run benchmark tests on 'make test'
Fixes: https://github.com/nodejs/node/issues/34427
PR-URL: https://github.com/nodejs/node/pull/34434
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -298,8 +298,8 @@ v8: jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ --skip-tests=$(CI_SKIP_TESTS) \ - $(CI_JS_SUITES) \ - $(CI_NATIVE_SUITES) + $(JS_SUITES) \ + $(NATIVE_SUITES) .PHONY: tooltest tooltest: @@ -492,9 +492,11 @@ test-all-valgrind: test-build test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run all test suites. $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/* +JS_SUITES ?= default +NATIVE_SUITES ?= addons js-native-api node-api # CI_* variables should be kept synchronized with the ones in vcbuild.bat -CI_NATIVE_SUITES ?= addons js-native-api node-api -CI_JS_SUITES ?= default benchmark +CI_NATIVE_SUITES ?= $(NATIVE_SUITES) +CI_JS_SUITES ?= $(JS_SUITES) benchmark ifeq ($(node_use_openssl), false) CI_DOC := doctool else @@ -654,8 +656,8 @@ test-with-async-hooks: $(MAKE) build-node-api-tests $(MAKE) cctest NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ - $(CI_JS_SUITES) \ - $(CI_NATIVE_SUITES) + $(JS_SUITES) \ + $(NATIVE_SUITES) .PHONY: test-v8 |