From 8d3fee1bb3611fb6ec5c17cdfd6705d969922fc8 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 27 Mar 2019 13:13:24 +0100 Subject: [PATCH] test: move hasCrypto check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hasCrypto check should be checked before anything else to prevent overhead in case it's not falsy. Otherwise the file would be read without any further benefit. PR-URL: https://github.com/nodejs/node/pull/26858 Reviewed-By: James M Snell Reviewed-By: Tobias Nießen Reviewed-By: Michaël Zasso --- test/common/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/common/index.js b/test/common/index.js index a6766b784e7641..a347db0026680d 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -48,8 +48,11 @@ const hasCrypto = Boolean(process.versions.openssl); // Check for flags. Skip this for workers (both, the `cluster` module and // `worker_threads`) and child processes. +// If the binary was built without-ssl then the crypto flags are +// invalid (bad option). The test itself should handle this case. if (process.argv.length === 2 && isMainThread && + hasCrypto && module.parent && require('cluster').isMaster) { // The copyright notice is relatively big and the flags could come afterwards. @@ -74,9 +77,6 @@ if (process.argv.length === 2 && const args = process.execArgv.map((arg) => arg.replace(/_/g, '-')); for (const flag of flags) { if (!args.includes(flag) && - // If the binary was built without-ssl then the crypto flags are - // invalid (bad option). The test itself should handle this case. - hasCrypto && // If the binary is build without `intl` the inspect option is // invalid. The test itself should handle this case. (process.features.inspector || !flag.startsWith('--inspect'))) {