Added precheck that curl supports the 'openssl' engine in test 307.

This commit is contained in:
Dan Fandrich 2007-01-18 18:04:20 +00:00
parent 521c4b303d
commit 3bae748256
4 changed files with 24 additions and 1 deletions

View File

@ -21,7 +21,7 @@ OpenSSL
https
</server>
<precheck>
echo Cannot determine list of SSL engines
perl %SRCDIR/libtest/test307.pl %CURL
</precheck>
<name>

View File

@ -35,6 +35,8 @@ INCLUDES = -I$(top_srcdir)/include/curl \
LIBDIR = $(top_builddir)/lib
EXTRA_DIST = test307.pl
# these files are used in every single test program below
SUPPORTFILES = first.c test.h

19
tests/libtest/test307.pl Executable file
View File

@ -0,0 +1,19 @@
#!/usr/bin/env perl
# Determine if the given curl executable supports the 'openssl' SSL engine
if ( $#ARGV != 0 )
{
print "Usage: $0 curl-executable\n";
exit 3;
}
if (!open(CURL, "@ARGV[0] -s --engine list|"))
{
print "Can't get SSL engine list\n";
exit 2;
}
while( <CURL> )
{
exit 0 if ( /openssl/ );
}
close CURL;
print "openssl engine not supported\n";
exit 1;

View File

@ -1111,6 +1111,7 @@ sub subVariables {
$$thing =~ s/%PWD/$pwd/g;
$$thing =~ s/%TFTPPORT/$TFTPPORT/g;
$$thing =~ s/%TFTP6PORT/$TFTP6PORT/g;
$$thing =~ s/%CURL/$CURL/g;
# The purpose of FTPTIME2 and FTPTIME3 is to provide times that can be
# used for time-out tests and that whould work on most hosts as these
@ -1226,6 +1227,7 @@ sub singletest {
my @precheck = getpart("client", "precheck");
$cmd = $precheck[0];
chomp $cmd;
subVariables \$cmd;
if($cmd) {
my @o = `$cmd 2>/dev/null`;
if($o[0]) {