OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

build: do not run benchmark tests on 'make test'

Browse Source 
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>
This commit is contained in:
Rich Trott
2020-07-19 21:13:13 -07:00
parent 90ee98a7d1
commit 3caa2e256b
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

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

8
vcbuild.bat
View File

@@ -15,12 +15,14 @@ if /i "%1"=="/?" goto help
cd %~dp0
set JS_SUITES=default
set NATIVE_SUITES=addons js-native-api node-api
@rem CI_* variables should be kept synchronized with the ones in Makefile
set CI_NATIVE_SUITES=addons js-native-api node-api
set CI_JS_SUITES=default benchmark
set "CI_NATIVE_SUITES=%NATIVE_SUITES%"
set "CI_JS_SUITES=%JS_SUITES% benchmark"
set CI_DOC=doctool
@rem Same as the test-ci target in Makefile
set "common_test_suites=%CI_JS_SUITES% %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
set "common_test_suites=%JS_SUITES% %NATIVE_SUITES%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
@rem Process arguments.
set config=Release