diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-11-15 05:37:55 +0100 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-11-18 13:26:08 +0100 |
| commit | 23e692813f24538285df6fa0d30773cf5b1401f9 (patch) | |
| tree | bb51198c6a26a1cc1ed3e9193e64c26e1dd5372a /tools/test.py | |
| parent | 34eccb2a1b1f4d7e8ddf7c0bc6f6d61ec530381f (diff) | |
| download | android-node-v8-23e692813f24538285df6fa0d30773cf5b1401f9.tar.gz android-node-v8-23e692813f24538285df6fa0d30773cf5b1401f9.tar.bz2 android-node-v8-23e692813f24538285df6fa0d30773cf5b1401f9.zip | |
test: skip test that use --tls-v1.x flags
Currently, configuring --without-ssl will cause the following test to
fail:
=== release test-https-agent-additional-options ===
Path: parallel/test-https-agent-additional-options
out/Release/node: bad option: --tls-v1.1
Command: out/Release/node --tls-v1.1
/node/test/parallel/test-https-agent-additional-options.js
=== release test-https-agent-session-eviction ===
Path: parallel/test-https-agent-session-eviction
out/Release/node: bad option: --tls-v1.0
Command: out/Release/node --tls-v1.0
/node/test/parallel/test-https-agent-session-eviction.js
This commit adds a check for the --tls-v.x flags and skips them if node
was built without crypto support.
PR-URL: https://github.com/nodejs/node/pull/24376
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'tools/test.py')
| -rwxr-xr-x | tools/test.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/test.py b/tools/test.py index 3a464be61d..67b8cb917e 100755 --- a/tools/test.py +++ b/tools/test.py @@ -907,6 +907,7 @@ class Context(object): self.repeat = repeat self.abort_on_timeout = abort_on_timeout self.v8_enable_inspector = True + self.node_has_crypto = True def GetVm(self, arch, mode): if arch == 'none': @@ -1632,9 +1633,14 @@ def Main(): # We want to skip the inspector tests if node was built without the inspector. has_inspector = Execute([vm, - "-p", "process.config.variables.v8_enable_inspector"], context) - if has_inspector.stdout.rstrip() == "0": - context.v8_enable_inspector = False + '-p', 'process.config.variables.v8_enable_inspector'], context) + if has_inspector.stdout.rstrip() == '0': + context.v8_enable_inspector = False + + has_crypto = Execute([vm, + '-p', 'process.versions.openssl'], context) + if has_crypto.stdout.rstrip() == 'undefined': + context.node_has_crypto = False if options.cat: visited = set() |