Commit 15aeb94f authored by Yang Tse's avatar Yang Tse
Browse files

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.
parent b6a3e2be

configure.ac

+2 −1
Original line number Diff line number Diff line
@@ -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

tests/runtests.pl

+9 −4
Original line number Diff line number Diff line
@@ -2417,11 +2417,16 @@ sub singletest { 
                    delete $ENV{$var} if($ENV{$var});

                }

                else {

                    if(($var =~ /^LD_PRELOAD/) &&

                       ($debug_build || ($has_shared ne "yes"))) {

                    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";

                }

            }