generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

runtests: disable memory tracking with threaded resolver

Browse Source 
The built-in memory debug system doesn't work with multi-threaded use so
instead of causing annoying false positives, disable the memory tracking
if the threaded resolver is used.
This commit is contained in:
Daniel Stenberg 2014-01-08 13:20:29 +01:00
parent 2d435c7fb5
commit 31075a8897
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/runtests.pl
View File

@ -226,6 +226,10 @@ my $has_darwinssl;# build with DarwinSSL (Secure Transport)
my $has_shared = "unknown"; # built shared my $has_shared = "unknown"; # built shared
my $resolver; # string to hold the resolver backend
my $has_cares; # if built with c-ares
my $has_threadedres; # if built with threaded resolver
my $ssllib; # name of the lib we use (for human presentation) my $ssllib; # name of the lib we use (for human presentation)
my $has_crypto; # set if libcurl is built with cryptographic support my $has_crypto; # set if libcurl is built with cryptographic support
my $has_textaware; # set if running on a system that has a text mode concept my $has_textaware; # set if running on a system that has a text mode concept
@ -2283,6 +2287,7 @@ sub checksystem {
@version = <VERSOUT>; @version = <VERSOUT>;
close(VERSOUT); close(VERSOUT);
$resolver="stock";
for(@version) { for(@version) {
chomp; chomp;
@ -2344,6 +2349,10 @@ sub checksystem {
$has_darwinssl=1; $has_darwinssl=1;
$ssllib="DarwinSSL"; $ssllib="DarwinSSL";
} }
elsif ($libcurl =~ /ares/i) {
$has_cares=1;
$resolver="c-ares";
}
} }
elsif($_ =~ /^Protocols: (.*)/i) { elsif($_ =~ /^Protocols: (.*)/i) {
# these are the protocols compiled in to this libcurl # these are the protocols compiled in to this libcurl
@ -2415,6 +2424,13 @@ sub checksystem {
# Metalink enabled # Metalink enabled
$has_metalink=1; $has_metalink=1;
} }
if($feat =~ /AsynchDNS/i) {
if(!$has_cares) {
# this means threaded resolver
$has_threadedres=1;
$resolver="threaded";
}
}
} }
# #
# Test harness currently uses a non-stunnel server in order to # Test harness currently uses a non-stunnel server in order to
@ -2511,6 +2527,13 @@ sub checksystem {
"* Host: $hostname", "* Host: $hostname",
"* System: $hosttype"); "* System: $hosttype");
if($has_memory_tracking && $has_threadedres) {
$has_memory_tracking = 0;
logmsg("*\n",
"*** DISABLES memory tracking when using threaded resolver\n",
"*\n");
}
logmsg sprintf("* Server SSL: %8s", $stunnel?"ON ":"OFF"); logmsg sprintf("* Server SSL: %8s", $stunnel?"ON ":"OFF");
logmsg sprintf(" libcurl SSL: %s\n", $ssl_version?"ON ":"OFF"); logmsg sprintf(" libcurl SSL: %s\n", $ssl_version?"ON ":"OFF");
logmsg sprintf("* debug build: %8s", $debug_build?"ON ":"OFF"); logmsg sprintf("* debug build: %8s", $debug_build?"ON ":"OFF");
@ -2519,7 +2542,8 @@ sub checksystem {
logmsg sprintf(" HTTP IPv6 %s\n", $http_ipv6?"ON ":"OFF"); logmsg sprintf(" HTTP IPv6 %s\n", $http_ipv6?"ON ":"OFF");
logmsg sprintf("* FTP IPv6 %8s", $ftp_ipv6?"ON ":"OFF"); logmsg sprintf("* FTP IPv6 %8s", $ftp_ipv6?"ON ":"OFF");
logmsg sprintf(" Libtool lib: %s\n", $libtool?"ON ":"OFF"); logmsg sprintf(" Libtool lib: %s\n", $libtool?"ON ":"OFF");
logmsg sprintf("* Shared build: %s\n", $has_shared); logmsg sprintf("* Shared build: %-3s", $has_shared);
logmsg sprintf(" Resolver: %s\n", $resolver);
if($ssl_version) { if($ssl_version) {
logmsg sprintf("* SSL library: %13s\n", $ssllib); logmsg sprintf("* SSL library: %13s\n", $ssllib);
} }