Skip to content

Commit

Permalink
test: check for openssl cli and provide path if it exists
Browse files Browse the repository at this point in the history
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: nodejs#1049
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Shigeki Ohtsu <[email protected]>
  • Loading branch information
jbergstroem authored and Shigeki Ohtsu committed Mar 5, 2015
1 parent 71776f9 commit c7ad320
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/parallel/test-http-curl-chunk-problem.js
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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];
Expand Down

0 comments on commit c7ad320

Please sign in to comment.