1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: check for openssl cli and provide path if it exists

Browse Source 
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 <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
This commit is contained in:
Johan Bergström 2015-03-04 12:09:07 +11:00 committed by Shigeki Ohtsu
parent 71776f9057
commit c7ad320472
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/parallel/test-http-curl-chunk-problem.js
View File

@ -1,11 +1,11 @@
if (!process.versions.openssl) { var common = require('../common');
console.error('Skipping because node compiled without OpenSSL.'); var assert = require('assert');
if (!common.opensslCli) {
console.error('Skipping because node compiled without OpenSSL CLI.');
process.exit(0); process.exit(0);
} }
// http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919 // http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919
var common = require('../common');
var assert = require('assert');
var http = require('http'); var http = require('http');
var cp = require('child_process'); var cp = require('child_process');
var fs = require('fs'); var fs = require('fs');
@ -16,7 +16,7 @@ var count = 0;
function maybeMakeRequest() { function maybeMakeRequest() {
if (++count < 2) return; if (++count < 2) return;
console.log('making curl request'); 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) { cp.exec(cmd, function(err, stdout, stderr) {
if (err) throw err; if (err) throw err;
var hex = stdout.match(/([A-Fa-f0-9]{40})/)[0]; var hex = stdout.match(/([A-Fa-f0-9]{40})/)[0];