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

test harness: take in account that Windows does not support LD_PRELOAD

Browse Source 
configure.ac: Test harness libhostname library will not be built for Windows.

runtests.pl: LD_PRELOAD mechanism will not be used to load libhostname
library on operating systems which lack LD_PRELOAD support.
This commit is contained in:
Yang Tse 2010-12-28 16:52:20 +01:00
parent b6a3e2be8e
commit 15aeb94f3f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2561,7 +2561,8 @@ AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1)
CURL_CHECK_LIB_ARES CURL_CHECK_LIB_ARES
AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes) AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes)
if test "x$enable_shared" = "xyes"; then if test "x$ac_cv_native_windows" != "xyes" &&
test "x$enable_shared" = "xyes"; then
build_libhostname=yes build_libhostname=yes
else else
build_libhostname=no build_libhostname=no

13
tests/runtests.pl
View File

@ -2417,10 +2417,15 @@ sub singletest {
delete $ENV{$var} if($ENV{$var}); delete $ENV{$var} if($ENV{$var});
} }
else { else {
if(($var =~ /^LD_PRELOAD/) && if($var =~ /^LD_PRELOAD/) {
($debug_build || ($has_shared ne "yes"))) { if(exe_ext() && (exe_ext() eq '.exe')) {
# print "Skipping LD_PRELOAD due to no release shared build\n"; # print "Skipping LD_PRELOAD due to lack of OS support\n";
next; next;
}
if($debug_build || ($has_shared ne "yes")) {
# print "Skipping LD_PRELOAD due to no release shared build\n";
next;
}
} }
$ENV{$var} = "$content"; $ENV{$var} = "$content";
} }