From c7ad320472d69962b48e10e564682f24dd31d1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Wed, 4 Mar 2015 12:09:07 +1100 Subject: [PATCH] test: check for openssl cli and provide path if it exists the previous version checked if io.js was compiled with openssl support which isn't really relevant since we're starting a http server. we on the other hand need an openssl-cli which may or may not exist. PR-URL: https://github.com/iojs/io.js/pull/1049 Reviewed-By: Ben Noordhuis Reviewed-By: Shigeki Ohtsu --- test/parallel/test-http-curl-chunk-problem.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js index fd429c6d5fd..58e195d4b41 100644 --- a/test/parallel/test-http-curl-chunk-problem.js +++ b/test/parallel/test-http-curl-chunk-problem.js @@ -1,11 +1,11 @@ -if (!process.versions.openssl) { - console.error('Skipping because node compiled without OpenSSL.'); +var common = require('../common'); +var assert = require('assert'); +if (!common.opensslCli) { + console.error('Skipping because node compiled without OpenSSL CLI.'); process.exit(0); } // http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919 -var common = require('../common'); -var assert = require('assert'); var http = require('http'); var cp = require('child_process'); var fs = require('fs'); @@ -16,7 +16,7 @@ var count = 0; function maybeMakeRequest() { if (++count < 2) return; console.log('making curl request'); - var cmd = 'curl http://127.0.0.1:' + common.PORT + '/ | openssl sha1'; + var cmd = 'curl http://127.0.0.1:' + common.PORT + '/ | ' + common.opensslCli + ' sha1'; cp.exec(cmd, function(err, stdout, stderr) { if (err) throw err; var hex = stdout.match(/([A-Fa-f0-9]{40})/)[0];