summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2019-01-15 05:14:30 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2019-01-18 12:06:31 +0100
commitc0acece7ed70b3584474d646fcb8ef93204540b6 (patch)
tree1965b3010fd2217213e17c4fb3e2b3a72fc0642c
parent2c0a75118cd6a2eaf6b45fe8c67336f44c86ab0f (diff)
downloadandroid-node-v8-c0acece7ed70b3584474d646fcb8ef93204540b6.tar.gz
android-node-v8-c0acece7ed70b3584474d646fcb8ef93204540b6.tar.bz2
android-node-v8-c0acece7ed70b3584474d646fcb8ef93204540b6.zip
test: use fipsMode instead of common.hasFipsCrypto
Currently, test-cli-node-print-help uses common.hasFipsCrypto to determine if the test should check for the existence of FIPS related options (--enable-fips, and --force-fips). The FIPS options are available when node has been compiled against an OpenSSL library with FIPS support in which case the test would verify that these options are available. But by using crypto.fips (which uses crypto.getFips()) this would only be checked when fips has been enabled, but these options are available regardless if FIPS is enabled or disabled. This commit updates the test to use fipsMode from config to determine if the FIPS options existence should be checked. PR-URL: https://github.com/nodejs/node/pull/25510 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--test/parallel/test-cli-node-print-help.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/parallel/test-cli-node-print-help.js b/test/parallel/test-cli-node-print-help.js
index 3f9354b89c..433a95faf2 100644
--- a/test/parallel/test-cli-node-print-help.js
+++ b/test/parallel/test-cli-node-print-help.js
@@ -1,3 +1,4 @@
+// Flags: --expose-internals
'use strict';
const common = require('../common');
@@ -7,6 +8,8 @@ const common = require('../common');
const assert = require('assert');
const { exec } = require('child_process');
+const { internalBinding } = require('internal/test/binding');
+const { fipsMode } = internalBinding('config');
let stdOut;
@@ -21,7 +24,6 @@ function startPrintHelpTest() {
function validateNodePrintHelp() {
const config = process.config;
const HAVE_OPENSSL = common.hasCrypto;
- const NODE_FIPS_MODE = common.hasFipsCrypto;
const NODE_HAVE_I18N_SUPPORT = common.hasIntl;
const HAVE_INSPECTOR = config.variables.v8_enable_inspector === 1;
@@ -29,7 +31,7 @@ function validateNodePrintHelp() {
{ compileConstant: HAVE_OPENSSL,
flags: [ '--openssl-config=...', '--tls-cipher-list=...',
'--use-bundled-ca', '--use-openssl-ca' ] },
- { compileConstant: NODE_FIPS_MODE,
+ { compileConstant: fipsMode,
flags: [ '--enable-fips', '--force-fips' ] },
{ compileConstant: NODE_HAVE_I18N_SUPPORT,
flags: [ '--icu-data-dir=...', 'NODE_ICU_DATA' ] },