Added precheck that curl supports the 'openssl' engine in test 307.
This commit is contained in:
parent
521c4b303d
commit
3bae748256
@ -21,7 +21,7 @@ OpenSSL
|
|||||||
https
|
https
|
||||||
</server>
|
</server>
|
||||||
<precheck>
|
<precheck>
|
||||||
echo Cannot determine list of SSL engines
|
perl %SRCDIR/libtest/test307.pl %CURL
|
||||||
</precheck>
|
</precheck>
|
||||||
|
|
||||||
<name>
|
<name>
|
||||||
|
@ -35,6 +35,8 @@ INCLUDES = -I$(top_srcdir)/include/curl \
|
|||||||
|
|
||||||
LIBDIR = $(top_builddir)/lib
|
LIBDIR = $(top_builddir)/lib
|
||||||
|
|
||||||
|
EXTRA_DIST = test307.pl
|
||||||
|
|
||||||
# these files are used in every single test program below
|
# these files are used in every single test program below
|
||||||
SUPPORTFILES = first.c test.h
|
SUPPORTFILES = first.c test.h
|
||||||
|
|
||||||
|
19
tests/libtest/test307.pl
Executable file
19
tests/libtest/test307.pl
Executable 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;
|
@ -1111,6 +1111,7 @@ sub subVariables {
|
|||||||
$$thing =~ s/%PWD/$pwd/g;
|
$$thing =~ s/%PWD/$pwd/g;
|
||||||
$$thing =~ s/%TFTPPORT/$TFTPPORT/g;
|
$$thing =~ s/%TFTPPORT/$TFTPPORT/g;
|
||||||
$$thing =~ s/%TFTP6PORT/$TFTP6PORT/g;
|
$$thing =~ s/%TFTP6PORT/$TFTP6PORT/g;
|
||||||
|
$$thing =~ s/%CURL/$CURL/g;
|
||||||
|
|
||||||
# The purpose of FTPTIME2 and FTPTIME3 is to provide times that can be
|
# 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
|
# 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");
|
my @precheck = getpart("client", "precheck");
|
||||||
$cmd = $precheck[0];
|
$cmd = $precheck[0];
|
||||||
chomp $cmd;
|
chomp $cmd;
|
||||||
|
subVariables \$cmd;
|
||||||
if($cmd) {
|
if($cmd) {
|
||||||
my @o = `$cmd 2>/dev/null`;
|
my @o = `$cmd 2>/dev/null`;
|
||||||
if($o[0]) {
|
if($o[0]) {
|
||||||
|
Loading…
Reference in New Issue
Block a user