Commit 3bae7482 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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

parent 521c4b30

tests/data/test307

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ OpenSSL 
https

</server>

<precheck>

echo Cannot determine list of SSL engines

perl %SRCDIR/libtest/test307.pl %CURL

</precheck>



 <name>

tests/libtest/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -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

tests/libtest/test307.pl

0 → 100755
+19 −0
Original line number Diff line number Diff line 
#!/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;

tests/runtests.pl

+2 −0
Original line number Diff line number Diff line
@@ -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]) {