39 files changed, 38 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index e003341f70..6a426384f2 100644
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,7 @@ v8:
 	tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
 
 .PHONY: jstest
-jstest: build-addons build-addons-napi bench-addons-build ## Runs addon tests and JS tests
+jstest: build-addons build-addons-napi ## Runs addon tests and JS tests
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
 		--skip-tests=$(CI_SKIP_TESTS) \
 		$(CI_JS_SUITES) \
@@ -414,7 +414,7 @@ clear-stalled:
 		echo $${PS_OUT} | xargs kill -9; \
 	fi
 
-test-build: | all build-addons build-addons-napi bench-addons-build
+test-build: | all build-addons build-addons-napi
 
 test-build-addons-napi: all build-addons-napi
 
@@ -455,7 +455,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-addons-napi doc-only bench-addons-build
+test-ci: | clear-stalled build-addons build-addons-napi doc-only
 	out/Release/cctest --gtest_output=tap:cctest.tap
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
@@ -499,7 +499,7 @@ test-message: test-build
 test-wpt: all
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) wpt
 
-test-simple: | cctest bench-addons-build  # Depends on 'all'.
+test-simple: | cctest # Depends on 'all'.
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) parallel sequential
 
 test-pummel: all
@@ -512,6 +512,9 @@ test-node-inspect: $(NODE_EXE)
 	USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \
 		--install deps/node-inspect test
 
+test-benchmark: | bench-addons-build
+	$(PYTHON) tools/test.py $(PARALLEL_ARGS) benchmark
+
 test-tick-processor: all
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) tick-processor
 
diff --git a/test/README.md b/test/README.md
index 7ef7052309..25243d7687 100644
--- a/test/README.md
+++ b/test/README.md
@@ -19,6 +19,7 @@ GitHub with the `autocrlf` git config flag set to true.
 | `addons`            | Yes             | Tests for [addon](https://nodejs.org/api/addons.html) functionality along with some tests that require an addon to function properly. |
 | `addons-napi`        | Yes            | Tests for [n-api](https://nodejs.org/api/n-api.html) functionality. |
 | `async-hooks`        | Yes            | Tests for [async_hooks](https://nodejs.org/api/async_hooks.html) functionality. |
+| `benchmark`          | No             | Test minimal functionality of benchmarks. |
 | `cctest`             | Yes            | C++ tests that are run as part of the build process. |
 | `code-cache`         | No             | Tests for a Node.js binary compiled with V8 code cache. |
 | `common`             |                | Common modules shared among many tests. [Documentation](./common/README.md) |
diff --git a/test/benchmark/benchmark.status b/test/benchmark/benchmark.status
new file mode 100644
index 0000000000..6a966743aa
--- /dev/null
+++ b/test/benchmark/benchmark.status
@@ -0,0 +1,21 @@
+prefix benchmark
+
+# To mark a test as flaky, list the test name in the appropriate section
+# below, without ".js", followed by ": PASS,FLAKY". Example:
+# sample-test                       : PASS,FLAKY
+
+[true] # This section applies to all platforms
+
+[$system==win32]
+
+[$system==linux]
+
+[$system==macos]
+
+[$system==solaris] # Also applies to SmartOS
+
+[$system==freebsd]
+
+[$system==aix]
+
+[$arch==arm]
diff --git a/test/parallel/test-benchmark-assert.js b/test/benchmark/test-benchmark-assert.js
index 8a8ba02444..8a8ba02444 100644
--- a/test/parallel/test-benchmark-assert.js
+++ b/test/benchmark/test-benchmark-assert.js
diff --git a/test/sequential/test-benchmark-async-hooks.js b/test/benchmark/test-benchmark-async-hooks.js
index 4cb6f89a8c..4cb6f89a8c 100644
--- a/test/sequential/test-benchmark-async-hooks.js
+++ b/test/benchmark/test-benchmark-async-hooks.js
diff --git a/test/sequential/test-benchmark-buffer.js b/test/benchmark/test-benchmark-buffer.js
index 171f755647..171f755647 100644
--- a/test/sequential/test-benchmark-buffer.js
+++ b/test/benchmark/test-benchmark-buffer.js
diff --git a/test/sequential/test-benchmark-child-process.js b/test/benchmark/test-benchmark-child-process.js
index 365777069b..365777069b 100644
--- a/test/sequential/test-benchmark-child-process.js
+++ b/test/benchmark/test-benchmark-child-process.js
diff --git a/test/parallel/test-benchmark-cluster.js b/test/benchmark/test-benchmark-cluster.js
index d6e3b27ee8..d6e3b27ee8 100644
--- a/test/parallel/test-benchmark-cluster.js
+++ b/test/benchmark/test-benchmark-cluster.js
diff --git a/test/parallel/test-benchmark-crypto.js b/test/benchmark/test-benchmark-crypto.js
index f24edf675f..f24edf675f 100644
--- a/test/parallel/test-benchmark-crypto.js
+++ b/test/benchmark/test-benchmark-crypto.js
diff --git a/test/sequential/test-benchmark-dgram.js b/test/benchmark/test-benchmark-dgram.js
index 8c93cd5a0c..8c93cd5a0c 100644
--- a/test/sequential/test-benchmark-dgram.js
+++ b/test/benchmark/test-benchmark-dgram.js
diff --git a/test/parallel/test-benchmark-dns.js b/test/benchmark/test-benchmark-dns.js
index 27c3271c74..27c3271c74 100644
--- a/test/parallel/test-benchmark-dns.js
+++ b/test/benchmark/test-benchmark-dns.js
diff --git a/test/parallel/test-benchmark-domain.js b/test/benchmark/test-benchmark-domain.js
index e7d8b60b71..e7d8b60b71 100644
--- a/test/parallel/test-benchmark-domain.js
+++ b/test/benchmark/test-benchmark-domain.js
diff --git a/test/parallel/test-benchmark-es.js b/test/benchmark/test-benchmark-es.js
index 47fe4ab3f9..47fe4ab3f9 100644
--- a/test/parallel/test-benchmark-es.js
+++ b/test/benchmark/test-benchmark-es.js
diff --git a/test/parallel/test-benchmark-events.js b/test/benchmark/test-benchmark-events.js
index 06be60a84a..06be60a84a 100644
--- a/test/parallel/test-benchmark-events.js
+++ b/test/benchmark/test-benchmark-events.js
diff --git a/test/parallel/test-benchmark-fs.js b/test/benchmark/test-benchmark-fs.js
index 7ae32fe617..7ae32fe617 100644
--- a/test/parallel/test-benchmark-fs.js
+++ b/test/benchmark/test-benchmark-fs.js
diff --git a/test/sequential/test-benchmark-http.js b/test/benchmark/test-benchmark-http.js
index 7255e655c0..7255e655c0 100644
--- a/test/sequential/test-benchmark-http.js
+++ b/test/benchmark/test-benchmark-http.js
diff --git a/test/sequential/test-benchmark-http2.js b/test/benchmark/test-benchmark-http2.js
index 1668a7b87f..1668a7b87f 100644
--- a/test/sequential/test-benchmark-http2.js
+++ b/test/benchmark/test-benchmark-http2.js
diff --git a/test/parallel/test-benchmark-misc.js b/test/benchmark/test-benchmark-misc.js
index b884152808..b884152808 100644
--- a/test/parallel/test-benchmark-misc.js
+++ b/test/benchmark/test-benchmark-misc.js
diff --git a/test/parallel/test-benchmark-module.js b/test/benchmark/test-benchmark-module.js
index d81936210c..d81936210c 100644
--- a/test/parallel/test-benchmark-module.js
+++ b/test/benchmark/test-benchmark-module.js
diff --git a/test/sequential/test-benchmark-napi.js b/test/benchmark/test-benchmark-napi.js
index 1a1ff23d60..1a1ff23d60 100644
--- a/test/sequential/test-benchmark-napi.js
+++ b/test/benchmark/test-benchmark-napi.js
diff --git a/test/sequential/test-benchmark-net.js b/test/benchmark/test-benchmark-net.js
index 5d3d283fc7..5d3d283fc7 100644
--- a/test/sequential/test-benchmark-net.js
+++ b/test/benchmark/test-benchmark-net.js
diff --git a/test/parallel/test-benchmark-os.js b/test/benchmark/test-benchmark-os.js
index 836e0e6504..836e0e6504 100644
--- a/test/parallel/test-benchmark-os.js
+++ b/test/benchmark/test-benchmark-os.js
diff --git a/test/sequential/test-benchmark-path.js b/test/benchmark/test-benchmark-path.js
index 890fd7ae41..890fd7ae41 100644
--- a/test/sequential/test-benchmark-path.js
+++ b/test/benchmark/test-benchmark-path.js
diff --git a/test/parallel/test-benchmark-process.js b/test/benchmark/test-benchmark-process.js
index 15cb678017..15cb678017 100644
--- a/test/parallel/test-benchmark-process.js
+++ b/test/benchmark/test-benchmark-process.js
diff --git a/test/parallel/test-benchmark-querystring.js b/test/benchmark/test-benchmark-querystring.js
index 77d0ac99ff..77d0ac99ff 100644
--- a/test/parallel/test-benchmark-querystring.js
+++ b/test/benchmark/test-benchmark-querystring.js
diff --git a/test/parallel/test-benchmark-streams.js b/test/benchmark/test-benchmark-streams.js
index f90838794c..f90838794c 100644
--- a/test/parallel/test-benchmark-streams.js
+++ b/test/benchmark/test-benchmark-streams.js
diff --git a/test/parallel/test-benchmark-string_decoder.js b/test/benchmark/test-benchmark-string_decoder.js
index f2fd6abe4b..f2fd6abe4b 100644
--- a/test/parallel/test-benchmark-string_decoder.js
+++ b/test/benchmark/test-benchmark-string_decoder.js
diff --git a/test/parallel/test-benchmark-timers.js b/test/benchmark/test-benchmark-timers.js
index af3c49bd71..af3c49bd71 100644
--- a/test/parallel/test-benchmark-timers.js
+++ b/test/benchmark/test-benchmark-timers.js
diff --git a/test/sequential/test-benchmark-tls.js b/test/benchmark/test-benchmark-tls.js
index 40c14af830..40c14af830 100644
--- a/test/sequential/test-benchmark-tls.js
+++ b/test/benchmark/test-benchmark-tls.js
diff --git a/test/parallel/test-benchmark-url.js b/test/benchmark/test-benchmark-url.js
index 92bb34de27..92bb34de27 100644
--- a/test/parallel/test-benchmark-url.js
+++ b/test/benchmark/test-benchmark-url.js
diff --git a/test/parallel/test-benchmark-util.js b/test/benchmark/test-benchmark-util.js
index 97b02bbdee..97b02bbdee 100644
--- a/test/parallel/test-benchmark-util.js
+++ b/test/benchmark/test-benchmark-util.js
diff --git a/test/parallel/test-benchmark-v8.js b/test/benchmark/test-benchmark-v8.js
index 22861785db..22861785db 100644
--- a/test/parallel/test-benchmark-v8.js
+++ b/test/benchmark/test-benchmark-v8.js
diff --git a/test/parallel/test-benchmark-vm.js b/test/benchmark/test-benchmark-vm.js
index 79ab6a0340..79ab6a0340 100644
--- a/test/parallel/test-benchmark-vm.js
+++ b/test/benchmark/test-benchmark-vm.js
diff --git a/test/sequential/test-benchmark-worker.js b/test/benchmark/test-benchmark-worker.js
index ae9a8a6701..ae9a8a6701 100644
--- a/test/sequential/test-benchmark-worker.js
+++ b/test/benchmark/test-benchmark-worker.js
diff --git a/test/parallel/test-benchmark-zlib.js b/test/benchmark/test-benchmark-zlib.js
index 25b7d1a4d5..25b7d1a4d5 100644
--- a/test/parallel/test-benchmark-zlib.js
+++ b/test/benchmark/test-benchmark-zlib.js
diff --git a/test/benchmark/testcfg.py b/test/benchmark/testcfg.py
new file mode 100644
index 0000000000..2c2929f610
--- /dev/null
+++ b/test/benchmark/testcfg.py
@@ -0,0 +1,6 @@
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+import testpy
+
+def GetConfiguration(context, root):
+  return testpy.SimpleTestConfiguration(context, root, 'benchmark')
diff --git a/test/root.status b/test/root.status
index 9ed9004c21..9c40512cb6 100644
--- a/test/root.status
+++ b/test/root.status
@@ -9,27 +9,6 @@ async-hooks/test-tlswrap: SLOW
 async-hooks/test-tlswrap: SLOW
 message/eval_messages: SLOW
 message/stdin_messages: SLOW
-parallel/test-benchmark-assert: SLOW
-parallel/test-benchmark-cluster: SLOW
-parallel/test-benchmark-crypto: SLOW
-parallel/test-benchmark-dns: SLOW
-parallel/test-benchmark-domain: SLOW
-parallel/test-benchmark-es: SLOW
-parallel/test-benchmark-events: SLOW
-parallel/test-benchmark-fs: SLOW
-parallel/test-benchmark-misc: SLOW
-parallel/test-benchmark-module: SLOW
-parallel/test-benchmark-os: SLOW
-parallel/test-benchmark-process: SLOW
-parallel/test-benchmark-querystring: SLOW
-parallel/test-benchmark-streams: SLOW
-parallel/test-benchmark-string_decoder: SLOW
-parallel/test-benchmark-timers: SLOW
-parallel/test-benchmark-url: SLOW
-parallel/test-benchmark-util: SLOW
-parallel/test-benchmark-v8: SLOW
-parallel/test-benchmark-vm: SLOW
-parallel/test-benchmark-zlib: SLOW
 parallel/test-buffer-constructor-node-modules-paths: SLOW
 parallel/test-buffer-indexof: SLOW
 parallel/test-child-process-spawnsync-input: SLOW
@@ -165,13 +144,6 @@ parallel/test-worker-unsupported-things: SLOW
 parallel/test-worker-workerdata-sharedarraybuffer: SLOW
 parallel/test-zlib-bytes-read: SLOW
 parallel/test-zlib-convenience-methods: SLOW
-sequential/test-benchmark-buffer: SLOW
-sequential/test-benchmark-child-process: SLOW
-sequential/test-benchmark-dgram: SLOW
-sequential/test-benchmark-http: SLOW
-sequential/test-benchmark-net: SLOW
-sequential/test-benchmark-path: SLOW
-sequential/test-benchmark-tls: SLOW
 sequential/test-child-process-execsync: SLOW
 sequential/test-child-process-exit: SLOW
 sequential/test-child-process-pass-fd: SLOW
diff --git a/tools/test.py b/tools/test.py
index cd36119665..3a464be61d 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1498,6 +1498,7 @@ def PrintCrashed(code):
 IGNORED_SUITES = [
   'addons',
   'addons-napi',
+  'benchmark',
   'doctool',
   'internet',
   'pummel',
diff --git a/vcbuild.bat b/vcbuild.bat
index 1e31440cc2..a22c756200 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -83,6 +83,7 @@ if /i "%1"=="build-addons"   set build_addons=1&goto arg-ok
 if /i "%1"=="build-addons-napi"   set build_addons_napi=1&goto arg-ok
 if /i "%1"=="test-addons"   set test_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons-napi"   set test_args=%test_args% addons-napi&set build_addons_napi=1&goto arg-ok
+if /i "%1"=="test-benchmark" set test_args=%test_args% benchmark&goto arg-ok
 if /i "%1"=="test-simple"   set test_args=%test_args% sequential parallel -J&goto arg-ok
 if /i "%1"=="test-message"  set test_args=%test_args% message&goto arg-ok
 if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
@@ -634,7 +635,7 @@ del .used_configure_flags
 goto exit
 
 :help
-echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-addons-napi/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [noetw] [ltcg] [nopch] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [no-cctest] [openssl-no-asm]
+echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-addons-napi/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [noetw] [ltcg] [nopch] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [no-cctest] [openssl-no-asm]
 echo Examples:
 echo   vcbuild.bat                          : builds release build
 echo   vcbuild.bat debug                    : builds debug build