summaryrefslogtreecommitdiff
path: root/jstests
diff options
context:
space:
mode:
authorShreyas Kalyan <shreyaskalyan@gmail.com>2018-10-09 14:40:30 -0400
committerShreyas Kalyan <shreyaskalyan@gmail.com>2018-10-12 10:36:32 -0400
commit1b5f4ac035e2334417cb501e37eec14aea709eb7 (patch)
tree41d0321c90b623b38f4b4272c6a6565fede8f187 /jstests
parent8e638c938ed3c17d090a85de8b35676af31f8db5 (diff)
downloadmongo-1b5f4ac035e2334417cb501e37eec14aea709eb7.tar.gz
SERVER-37529 Fix issues for ssl_ECDHE_suites.js on non x86 evergreen machines
Diffstat (limited to 'jstests')
-rw-r--r--jstests/ssl/ssl_ECDHE_suites.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/jstests/ssl/ssl_ECDHE_suites.js b/jstests/ssl/ssl_ECDHE_suites.js
index ebcaa6fc7a3..d3f65a867bf 100644
--- a/jstests/ssl/ssl_ECDHE_suites.js
+++ b/jstests/ssl/ssl_ECDHE_suites.js
@@ -5,10 +5,6 @@ load('jstests/ssl/libs/ssl_helpers.js');
(function() {
"use strict";
- if (getBuildInfo().buildEnvironment.target_os === "macOS") {
- return;
- }
-
const suites = [
"SSLV2 Cipher Suites",
"SSLV3 Cipher Suites",
@@ -20,6 +16,13 @@ load('jstests/ssl/libs/ssl_helpers.js');
const SERVER_CERT = "jstests/libs/server.pem";
function runSSLYze(port) {
+ let target_os = buildInfo().buildEnvironment.target_os;
+ let target_arch = buildInfo().buildEnvironment.target_arch;
+
+ if (target_os === "macOS" || target_arch !== "x86_64") {
+ return null;
+ }
+
let python = "/usr/bin/env python3";
let sslyze = " jstests/ssl/sslyze_tester.py ";
@@ -86,8 +89,9 @@ load('jstests/ssl/libs/ssl_helpers.js');
};
let mongod = MongoRunner.runMongod(x509_options);
var cipherDict = runSSLYze(mongod.port);
- testSSLYzeOutput(cipherDict);
-
+ if (cipherDict !== null) {
+ testSSLYzeOutput(cipherDict);
+ }
MongoRunner.stopMongod(mongod);
}
}()); \ No newline at end of file