components/curl/patches/009-runtests.pl.patch
branchs11u2-sru
changeset 4800 5aa28a7db635
equal deleted inserted replaced
4799:f6da2b76c51b 4800:5aa28a7db635
       
     1 The various curl NTLM tests try to LD_PRELOAD a test library
       
     2 called .../tests/libtest/.libs/libhostname.so that's been
       
     3 created as a pre-requisite to running the numerous Perl tests.
       
     4 
       
     5 This patch adjusts LD_PRELOAD to be LD_PRELOAD_32 or LD_PRELOAD_64
       
     6 depending upong whether we are running the 32 or 64 bit tests.
       
     7 
       
     8 As this is Solaris specific, this patch will not be pushed upstream.
       
     9 
       
    10 --- tests/runtests.pl.orig	2014-09-10 12:26:52.624143266 -0700
       
    11 +++ tests/runtests.pl	2014-09-10 16:51:13.663390869 -0700
       
    12 @@ -3060,6 +3060,12 @@
       
    13                              # print "Skipping LD_PRELOAD due to no release shared build\n";
       
    14                              next;
       
    15                          }
       
    16 +                        # make this LD_PRELOAD_{bits}
       
    17 +                        open(FP, "/bin/file $content |");
       
    18 +                        my $bits = <FP>;
       
    19 +                        if ($bits =~ /^.+ELF\s(\d\d)-bit.+$/) {
       
    20 +                            $var .= '_'.$1;
       
    21 +                        }
       
    22                      }
       
    23                      $ENV{$var} = "$content";
       
    24                  }