aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/runtests.pl24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index dc4b71cdf..4dbe563c7 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -199,8 +199,8 @@ my $valgrind_tool;
my $gdb = checktestcmd("gdb");
my $httptlssrv = find_httptlssrv();
-my $ssl_version; # set if libcurl is built with SSL support
-my $large_file; # set if libcurl is built with large file support
+my $has_ssl; # set if libcurl is built with SSL support
+my $has_largefile; # set if libcurl is built with large file support
my $has_idn; # set if libcurl is built with IDN support
my $http_ipv6; # set if HTTP server has IPv6 support
my $http_unix; # set if HTTP server has Unix sockets support
@@ -2411,11 +2411,11 @@ sub checksystem {
}
if($feat =~ /SSL/i) {
# ssl enabled
- $ssl_version=1;
+ $has_ssl=1;
}
if($feat =~ /Largefile/i) {
# large file support
- $large_file=1;
+ $has_largefile=1;
}
if($feat =~ /IDN/i) {
# IDN support
@@ -2596,7 +2596,7 @@ sub checksystem {
}
logmsg sprintf("* Server SSL: %8s", $stunnel?"ON ":"OFF");
- logmsg sprintf(" libcurl SSL: %s\n", $ssl_version?"ON ":"OFF");
+ logmsg sprintf(" libcurl SSL: %s\n", $has_ssl?"ON ":"OFF");
logmsg sprintf("* debug build: %8s", $debug_build?"ON ":"OFF");
logmsg sprintf(" track memory: %s\n", $has_memory_tracking?"ON ":"OFF");
logmsg sprintf("* valgrind: %8s", $valgrind?"ON ":"OFF");
@@ -2607,7 +2607,7 @@ sub checksystem {
logmsg sprintf("* PSL: %8s", $has_psl?"ON ":"OFF");
logmsg sprintf(" Resolver: %s\n", $resolver);
- if($ssl_version) {
+ if($has_ssl) {
logmsg sprintf("* SSL library: %13s\n", $ssllib);
}
@@ -2858,7 +2858,7 @@ sub singletest {
$feature{$1} = $1;
if($1 eq "SSL") {
- if($ssl_version) {
+ if($has_ssl) {
next;
}
}
@@ -2913,7 +2913,7 @@ sub singletest {
}
}
elsif($1 eq "large_file") {
- if($large_file) {
+ if($has_largefile) {
next;
}
}
@@ -3016,7 +3016,7 @@ sub singletest {
if($f =~ /^!(.*)$/) {
if($1 eq "SSL") {
- if(!$ssl_version) {
+ if(!$has_ssl) {
next;
}
}
@@ -3056,7 +3056,7 @@ sub singletest {
}
}
elsif($1 eq "large_file") {
- if(!$large_file) {
+ if(!$has_largefile) {
next;
}
}
@@ -4350,7 +4350,7 @@ sub startservers {
# we can't run ftps tests without stunnel
return "no stunnel";
}
- if(!$ssl_version) {
+ if(!$has_ssl) {
# we can't run ftps tests if libcurl is SSL-less
return "curl lacks SSL support";
}
@@ -4388,7 +4388,7 @@ sub startservers {
# we can't run https tests without stunnel
return "no stunnel";
}
- if(!$ssl_version) {
+ if(!$has_ssl) {
# we can't run https tests if libcurl is SSL-less
return "curl lacks SSL support";
}