Skip to content

Commit

Permalink
build: do not run benchmark tests on 'make test'
Browse files Browse the repository at this point in the history
Fixes: #34427

PR-URL: #34434
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
Trott authored and ruyadorno committed Jul 29, 2020
1 parent b24f254 commit 24e1beb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 24e1beb

Please sign in to comment.