# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
my $has_threadedres;# set if built with threaded resolver
# this version is decided by the particular nghttp2 library that is being used
-my $h2cver = "h2c";
+my $h2cver = "h2c-14";
my $has_openssl; # built with a lib using an OpenSSL-like API
my $has_gnutls; # built with GnuTLS
my $has_polarssl; # built with polarssl
my $has_axtls; # built with axTLS
my $has_winssl; # built with WinSSL (Secure Channel aka Schannel)
-my $has_darwinssl; # built with DarwinSSL (Secure Transport)
-my $has_boringssl; # built with BoringSSL
-my $has_libressl; # built with libressl
+my $has_darwinssl; # build with DarwinSSL (Secure Transport)
my $has_sslpinning; # built with a TLS backend that supports pinning
my $ret = 0;
if($gdbthis) {
- runclient($gdbline);
+ runclient($gdbline)
}
else {
$ret = runclient($testcmd);
}
elsif ($libcurl =~ /nss/i) {
$has_nss=1;
- $has_sslpinning=1;
$ssllib="NSS";
}
- elsif ($libcurl =~ /(yassl|wolfssl)/i) {
+ elsif ($libcurl =~ /yassl/i) {
$has_yassl=1;
- $has_sslpinning=1;
$ssllib="yassl";
}
elsif ($libcurl =~ /polarssl/i) {
$has_darwinssl=1;
$ssllib="DarwinSSL";
}
- elsif ($libcurl =~ /BoringSSL/i) {
- $has_boringssl=1;
- $ssllib="BoringSSL";
- }
- elsif ($libcurl =~ /libressl/i) {
- $has_libressl=1;
- $ssllib="libressl";
- }
if ($libcurl =~ /ares/i) {
$has_cares=1;
$resolver="c-ares";
}
elsif ($ARGV[0] eq "-c") {
# use this path to curl instead of default
- $DBGCURL=$CURL="\"$ARGV[1]\"";
+ $DBGCURL=$CURL=$ARGV[1];
shift @ARGV;
}
elsif ($ARGV[0] eq "-vc") {
# Fetch all disabled tests, if there are any
#
-sub disabledtests {
- my ($file) = @_;
-
- if(open(D, "<$file")) {
- while(<D>) {
- if(/^ *\#/) {
- # allow comments
- next;
- }
- if($_ =~ /(\d+)/) {
- $disabled{$1}=$1; # disable this test number
- }
+if(open(D, "<$TESTDIR/DISABLED")) {
+ while(<D>) {
+ if(/^ *\#/) {
+ # allow comments
+ next;
+ }
+ if($_ =~ /(\d+)/) {
+ $disabled{$1}=$1; # disable this test number
}
- close(D);
}
+ close(D);
}
-# globally disabled tests
-disabledtests("$TESTDIR/DISABLED");
-
-# locally disabled tests, ignored by git etc
-disabledtests("$TESTDIR/DISABLED.local");
-
#######################################################################
# If 'all' tests are requested, find out all test numbers
#