diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-12-28 16:52:20 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-12-28 16:52:20 +0100 |
| commit | 15aeb94f3ff9012728aff1d21b63729af7433dd1 (patch) | |
| tree | ebf9d070295515c6b1bc33dc450f5a839ac8d6a8 | |
| parent | b6a3e2be8e1bbb183597399c0dcdaa67022b958e (diff) | |
test harness: take in account that Windows does not support LD_PRELOAD
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.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | tests/runtests.pl | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ea5168935..1dab90e35 100644 --- a/configure.ac +++ b/configure.ac @@ -2561,7 +2561,8 @@ AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1) CURL_CHECK_LIB_ARES 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 else build_libhostname=no diff --git a/tests/runtests.pl b/tests/runtests.pl index 2ec18bf78..75f441bde 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2417,10 +2417,15 @@ sub singletest { delete $ENV{$var} if($ENV{$var}); } else { - if(($var =~ /^LD_PRELOAD/) && - ($debug_build || ($has_shared ne "yes"))) { - # print "Skipping LD_PRELOAD due to no release shared build\n"; - next; + if($var =~ /^LD_PRELOAD/) { + if(exe_ext() && (exe_ext() eq '.exe')) { + # print "Skipping LD_PRELOAD due to lack of OS support\n"; + next; + } + if($debug_build || ($has_shared ne "yes")) { + # print "Skipping LD_PRELOAD due to no release shared build\n"; + next; + } } $ENV{$var} = "$content"; } |