summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-04-27 10:11:40 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-04-29 13:57:38 +0200
commit427cd293d593511f3f592f3bcf99b0f4b4900fda (patch)
tree8f61f90a22508121c27ddc898d6e9a519241ff1f /test
parenta1a54ca3f1c55d3e7fb56fa566c98bc6c0a2dd9a (diff)
downloadandroid-node-v8-427cd293d593511f3f592f3bcf99b0f4b4900fda.tar.gz
android-node-v8-427cd293d593511f3f592f3bcf99b0f4b4900fda.tar.bz2
android-node-v8-427cd293d593511f3f592f3bcf99b0f4b4900fda.zip
test: add hasCrypto check to test-cli-node-options
Currently when configure --without-ssl the test will throw the following error: bad option: --use-openssl-ca This commit checks if crypto was enabled and skips the crypto related tests if that is the case. PR-URL: https://github.com/nodejs/node/pull/12692 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>/
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-cli-node-options.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
index 90e995af9b..47fd4b85c7 100644
--- a/test/parallel/test-cli-node-options.js
+++ b/test/parallel/test-cli-node-options.js
@@ -53,9 +53,11 @@ expect('--track-heap-objects', 'B\n');
expect('--throw-deprecation', 'B\n');
expect('--zero-fill-buffers', 'B\n');
expect('--v8-pool-size=10', 'B\n');
-expect('--use-openssl-ca', 'B\n');
-expect('--use-bundled-ca', 'B\n');
-expect('--openssl-config=_ossl_cfg', 'B\n');
+if (common.hasCrypto) {
+ expect('--use-openssl-ca', 'B\n');
+ expect('--use-bundled-ca', 'B\n');
+ expect('--openssl-config=_ossl_cfg', 'B\n');
+}
expect('--icu-data-dir=_d', 'B\n');
// V8 options