Skip to content

Commit beb0800

Browse files
TrottBridgeAR
authored andcommitted
test: move benchmark tests out of main test suite
Move benchmark tests (which are slow) out of the main test suite. We can hopefully add them to node-daily-master so that they are still run daily on CI. PR-URL: #24265 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: MichaΓ«l Zasso <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 8835196 commit beb0800

39 files changed

+38
-33
lines changed

β€ŽMakefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ v8:
270270
tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
271271

272272
.PHONY: jstest
273-
jstest: build-addons build-addons-napi bench-addons-build ## Runs addon tests and JS tests
273+
jstest: build-addons build-addons-napi ## Runs addon tests and JS tests
274274
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
275275
--skip-tests=$(CI_SKIP_TESTS) \
276276
$(CI_JS_SUITES) \
@@ -414,7 +414,7 @@ clear-stalled:
414414
echo $${PS_OUT} | xargs kill -9; \
415415
fi
416416

417-
test-build: | all build-addons build-addons-napi bench-addons-build
417+
test-build: | all build-addons build-addons-napi
418418

419419
test-build-addons-napi: all build-addons-napi
420420

@@ -455,7 +455,7 @@ test-ci-js: | clear-stalled
455455
.PHONY: test-ci
456456
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
457457
test-ci: LOGLEVEL := info
458-
test-ci: | clear-stalled build-addons build-addons-napi doc-only bench-addons-build
458+
test-ci: | clear-stalled build-addons build-addons-napi doc-only
459459
out/Release/cctest --gtest_output=tap:cctest.tap
460460
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
461461
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
@@ -499,7 +499,7 @@ test-message: test-build
499499
test-wpt: all
500500
$(PYTHON) tools/test.py $(PARALLEL_ARGS) wpt
501501

502-
test-simple: | cctest bench-addons-build # Depends on 'all'.
502+
test-simple: | cctest # Depends on 'all'.
503503
$(PYTHON) tools/test.py $(PARALLEL_ARGS) parallel sequential
504504

505505
test-pummel: all
@@ -512,6 +512,9 @@ test-node-inspect: $(NODE_EXE)
512512
USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \
513513
--install deps/node-inspect test
514514

515+
test-benchmark: | bench-addons-build
516+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) benchmark
517+
515518
test-tick-processor: all
516519
$(PYTHON) tools/test.py $(PARALLEL_ARGS) tick-processor
517520

β€Žtest/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ GitHub with the `autocrlf` git config flag set to true.
1919
| `addons` | Yes | Tests for [addon](https://nodejs.org/api/addons.html) functionality along with some tests that require an addon to function properly. |
2020
| `addons-napi` | Yes | Tests for [n-api](https://nodejs.org/api/n-api.html) functionality. |
2121
| `async-hooks` | Yes | Tests for [async_hooks](https://nodejs.org/api/async_hooks.html) functionality. |
22+
| `benchmark` | No | Test minimal functionality of benchmarks. |
2223
| `cctest` | Yes | C++ tests that are run as part of the build process. |
2324
| `code-cache` | No | Tests for a Node.js binary compiled with V8 code cache. |
2425
| `common` | | Common modules shared among many tests. [Documentation](./common/README.md) |

β€Žtest/benchmark/benchmark.status

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
prefix benchmark
2+
3+
# To mark a test as flaky, list the test name in the appropriate section
4+
# below, without ".js", followed by ": PASS,FLAKY". Example:
5+
# sample-test : PASS,FLAKY
6+
7+
[true] # This section applies to all platforms
8+
9+
[$system==win32]
10+
11+
[$system==linux]
12+
13+
[$system==macos]
14+
15+
[$system==solaris] # Also applies to SmartOS
16+
17+
[$system==freebsd]
18+
19+
[$system==aix]
20+
21+
[$arch==arm]

0 commit comments

Comments
Β (0)