test: create shared runBenchmark function

Mostly shared/duplicated logic between all benchmark test files, so creating a new common module to store it. PR-URL: #15004 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
nodejs · Sep 20, 2017 · 45cdbcf · 45cdbcf
1 parent 91e96d8
commit 45cdbcf
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 257 deletions.
diff --git a/test/common/README.md b/test/common/README.md
@@ -4,9 +4,21 @@ This directory contains modules used to test the Node.js implementation.
 
 ## Table of Contents
 
+* [Benchmark module](#benchmark-module)
 * [Common module API](#common-module-api)
 * [WPT module](#wpt-module)
 
+## Benchmark Module
+
+The `benchmark` module is used by tests to run benchmarks.
+
+### runBenchmark(name, args, env)
+
+* `name` [&lt;String>] Name of benchmark suite to be run.
+* `args` [&lt;Array>] Array of environment variable key/value pairs (ex:
+  `n=1`) to be applied via `--set`.
+* `env` [&lt;Object>] Environment variables to be applied during the run.
+
 ## Common Module API
 
 The `common` module is used by tests for consistency across repeated

diff --git a/test/common/benchmark.js b/test/common/benchmark.js
@@ -0,0 +1,30 @@
+/* eslint-disable required-modules */
+
+'use strict';
+
+const assert = require('assert');
+const fork = require('child_process').fork;
+const path = require('path');
+
+const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
+
+function runBenchmark(name, args, env) {
+  const argv = [];
+
+  for (let i = 0; i < args.length; i++) {
+    argv.push('--set');
+    argv.push(args[i]);
+  }
+
+  argv.push(name);
+
+  const mergedEnv = Object.assign({}, process.env, env);
+
+  const child = fork(runjs, argv, { env: mergedEnv });
+  child.on('exit', (code, signal) => {
+    assert.strictEqual(code, 0);
+    assert.strictEqual(signal, null);
+  });
+}
+
+module.exports = runBenchmark;
diff --git a/test/parallel/test-benchmark-arrays.js b/test/parallel/test-benchmark-arrays.js
@@ -2,20 +2,6 @@
 
 require('../common');
 
-// Minimal test for arrays benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
+const runBenchmark = require('../common/benchmark');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'n=1',
-              '--set', 'type=Array',
-              'arrays'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('arrays', ['n=1', 'type=Array']);
diff --git a/test/parallel/test-benchmark-cluster.js b/test/parallel/test-benchmark-cluster.js
@@ -2,21 +2,6 @@
 
 require('../common');
 
-// Minimal test for cluster benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
+const runBenchmark = require('../common/benchmark');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'n=1',
-              '--set', 'payload=string',
-              '--set', 'sendsPerBroadcast=1',
-              'cluster'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('cluster', ['n=1', 'payload=string', 'sendsPerBroadcast=1']);
diff --git a/test/parallel/test-benchmark-crypto.js b/test/parallel/test-benchmark-crypto.js
@@ -8,29 +8,18 @@ if (!common.hasCrypto)
 if (common.hasFipsCrypto)
   common.skip('some benchmarks are FIPS-incompatible');
 
-// Minimal test for crypto benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
-
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'algo=sha256',
-              '--set', 'api=stream',
-              '--set', 'keylen=1024',
-              '--set', 'len=1',
-              '--set', 'n=1',
-              '--set', 'out=buffer',
-              '--set', 'type=buf',
-              '--set', 'v=crypto',
-              '--set', 'writes=1',
-              'crypto'];
-
-const child = fork(runjs, argv, { env: Object.assign({}, process.env, {
-  NODEJS_BENCHMARK_ZERO_ALLOWED: 1 }) });
-
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+const runBenchmark = require('../common/benchmark');
+
+runBenchmark('crypto',
+             [
+               'n=1',
+               'algo=sha256',
+               'api=stream',
+               'keylen=1024',
+               'len=1',
+               'out=buffer',
+               'type=buf',
+               'v=crypto',
+               'writes=1'
+             ],
+             { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
diff --git a/test/parallel/test-benchmark-dns.js b/test/parallel/test-benchmark-dns.js
@@ -2,26 +2,9 @@
 
 require('../common');
 
-// Minimal test for dns benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
-
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
+const runBenchmark = require('../common/benchmark');
 
 const env = Object.assign({}, process.env,
                           { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
 
-const child = fork(runjs,
-                   ['--set', 'n=1',
-                    '--set', 'all=false',
-                    '--set', 'name=127.0.0.1',
-                    'dns'],
-                   { env });
-
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('dns', ['n=1', 'all=false', 'name=127.0.0.1'], env);
diff --git a/test/parallel/test-benchmark-domain.js b/test/parallel/test-benchmark-domain.js
@@ -2,20 +2,6 @@
 
 require('../common');
 
-// Minimal test for domain benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
+const runBenchmark = require('../common/benchmark');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'arguments=0',
-              '--set', 'n=1',
-              'domain'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('domain', ['n=1', 'arguments=0']);
diff --git a/test/parallel/test-benchmark-events.js b/test/parallel/test-benchmark-events.js
@@ -2,19 +2,6 @@
 
 require('../common');
 
-// Minimal test for events benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
+const runBenchmark = require('../common/benchmark');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'n=1',
-              'events'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('events', ['n=1']);
diff --git a/test/parallel/test-benchmark-os.js b/test/parallel/test-benchmark-os.js
@@ -2,19 +2,6 @@
 
 require('../common');
 
-// Minimal test for os benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
+const runBenchmark = require('../common/benchmark');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'n=1',
-              'os'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+runBenchmark('os', ['n=1']);
diff --git a/test/parallel/test-benchmark-path.js b/test/parallel/test-benchmark-path.js
@@ -2,23 +2,13 @@
 
 require('../common');
 
-// Minimal test for path benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
-
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'n=1',
-              '--set', 'path=',
-              '--set', 'pathext=',
-              '--set', 'paths=',
-              '--set', 'props=',
-              'path'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+const runBenchmark = require('../common/benchmark');
+
+runBenchmark('path',
+             [
+               'n=1',
+               'path=',
+               'pathext=',
+               'paths=',
+               'props='
+             ]);
diff --git a/test/parallel/test-benchmark-process.js b/test/parallel/test-benchmark-process.js
@@ -2,21 +2,11 @@
 
 require('../common');
 
-// Minimal test for process benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
-
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'millions=0.000001',
-              '--set', 'n=1',
-              '--set', 'type=raw',
-              'process'];
-
-const child = fork(runjs, argv);
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+const runBenchmark = require('../common/benchmark');
+
+runBenchmark('process',
+             [
+               'millions=0.000001',
+               'n=1',
+               'type=raw'
+             ]);
diff --git a/test/parallel/test-benchmark-timers.js b/test/parallel/test-benchmark-timers.js
@@ -2,24 +2,12 @@
 
 require('../common');
 
-// Minimal test for timers benchmarks. This makes sure the benchmarks aren't
-// horribly broken but nothing more than that.
-
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-const argv = ['--set', 'type=depth',
-              '--set', 'millions=0.000001',
-              '--set', 'thousands=0.001',
-              'timers'];
-
-const env = Object.assign({}, process.env,
-                          { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
-
-const child = fork(runjs, argv, { env });
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+const runBenchmark = require('../common/benchmark');
+
+runBenchmark('timers',
+             [
+               'type=depth',
+               'millions=0.000001',
+               'thousands=0.001'
+             ],
+             { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
diff --git a/test/sequential/test-benchmark-child-process.js b/test/sequential/test-benchmark-child-process.js
@@ -2,29 +2,14 @@
 
 require('../common');
 
-const assert = require('assert');
-const fork = require('child_process').fork;
-const path = require('path');
-
-const runjs = path.join(__dirname, '..', '..', 'benchmark', 'run.js');
-
-const env = Object.assign({}, process.env,
-                          { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
-
-const child = fork(
-  runjs,
-  [
-    '--set', 'dur=0',
-    '--set', 'n=1',
-    '--set', 'len=1',
-    '--set', 'params=1',
-    '--set', 'methodName=execSync',
-    'child_process'
-  ],
-  { env }
-);
-
-child.on('exit', (code, signal) => {
-  assert.strictEqual(code, 0);
-  assert.strictEqual(signal, null);
-});
+const runBenchmark = require('../common/benchmark');
+
+runBenchmark('child_process',
+             [
+               'dur=0',
+               'n=1',
+               'len=1',
+               'params=1',
+               'methodName=execSync',
+             ],
+             { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });