summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2020-07-09 21:47:27 -0700
committerRuy Adorno <ruyadorno@hotmail.com>2020-07-29 11:20:59 -0400
commitb24f254472363929e1f56ad5e29585ffbc9946d1 (patch)
tree485ee13594fcfe170a219ab7babed0d1b8cbc5a2
parentfced3ce5adf4f7bc7b66c924eb57f20ebfdb3c81 (diff)
downloadnode-new-b24f254472363929e1f56ad5e29585ffbc9946d1.tar.gz
build: add benchmark tests to CI runs
Closes: https://github.com/nodejs/node/issues/34321 PR-URL: https://github.com/nodejs/node/pull/34288 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matheus Marchini <mat@mmarchini.me>
-rw-r--r--Makefile4
-rw-r--r--test/benchmark/benchmark.status4
-rw-r--r--vcbuild.bat2
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 58e7d4de47..130afdfeb2 100644
--- a/Makefile
+++ b/Makefile
@@ -494,7 +494,7 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
# 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
+CI_JS_SUITES ?= default benchmark
ifeq ($(node_use_openssl), false)
CI_DOC := doctool
else
@@ -527,7 +527,7 @@ test-ci-js: | clear-stalled
.PHONY: test-ci
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
test-ci: LOGLEVEL := info
-test-ci: | clear-stalled build-addons build-js-native-api-tests build-node-api-tests doc-only
+test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests doc-only
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
diff --git a/test/benchmark/benchmark.status b/test/benchmark/benchmark.status
index 6a966743aa..0db4181af0 100644
--- a/test/benchmark/benchmark.status
+++ b/test/benchmark/benchmark.status
@@ -19,3 +19,7 @@ prefix benchmark
[$system==aix]
[$arch==arm]
+# https://github.com/nodejs/node/issues/34266
+test-benchmark-fs: SKIP
+# https://github.com/nodejs/build/issues/2382
+test-benchmark-napi: SKIP
diff --git a/vcbuild.bat b/vcbuild.bat
index 37f23017ee..4f78fdfe4a 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -17,7 +17,7 @@ cd %~dp0
@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
+set CI_JS_SUITES=default 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"