test: run crypto benchmark only once in tests

Prevent crypto benchmark files from running more than one benchmark during tests. PR-URL: #21032 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]>
nodejs · Jun 6, 2018 · c8ee379 · c8ee379
1 parent a3fdd2e
commit c8ee379
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/benchmark/crypto/aes-gcm-throughput.js b/benchmark/crypto/aes-gcm-throughput.js
@@ -9,6 +9,9 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, len, cipher }) {
+  // Default cipher for tests.
+  if (cipher === '')
+    cipher = 'aes-128-gcm';
   const message = Buffer.alloc(len, 'b');
   const key = crypto.randomBytes(keylen[cipher]);
   const iv = crypto.randomBytes(12);

diff --git a/benchmark/crypto/cipher-stream.js b/benchmark/crypto/cipher-stream.js
@@ -10,6 +10,9 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ api, cipher, type, len, writes }) {
+  // Default cipher for tests.
+  if (cipher === '')
+    cipher = 'AES192';
   if (api === 'stream' && /^v0\.[0-8]\./.test(process.version)) {
     console.error('Crypto streams not available until v0.10');
     // use the legacy, just so that we can compare them.

diff --git a/test/parallel/test-benchmark-crypto.js b/test/parallel/test-benchmark-crypto.js
@@ -12,14 +12,15 @@ const runBenchmark = require('../common/benchmark');
 
 runBenchmark('crypto',
              [
-               'n=1',
                'algo=sha256',
                'api=stream',
+               'cipher=',
                'keylen=1024',
                'len=1',
+               'n=1',
                'out=buffer',
                'type=buf',
                'v=crypto',
-               'writes=1'
+               'writes=1',
              ],
              { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });