components/curl/patches/009-runtests.pl.patch
author Rich Burridge <rich.burridge@oracle.com>
Fri, 15 Nov 2013 07:14:12 -0800
changeset 1553 3754a17bfb14
parent 1501 8be4b9d44152
child 2151 8977d970976a
permissions -rw-r--r--
17799440 problem in LIBRARY/CURL
The various curl NTLM tests try to LD_PRELOAD a test library
called .../tests/libtest/.libs/libhostname.so that's been
created as a pre-requisite to running the numerous Perl tests.

This patch adjusts LD_PRELOAD to be LD_PRELOAD_32 or LD_PRELOAD_64
depending upong whether we are running the 32 or 64 bit tests.

As this is Solaris specific, this patch will not be pushed upstream.

--- tests/runtests.pl.orig	2013-10-09 04:16:23.150958416 -0700
+++ tests/runtests.pl	2013-10-09 04:17:42.710320616 -0700
@@ -2830,6 +2830,12 @@
                             # print "Skipping LD_PRELOAD due to no release shared build\n";
                             next;
                         }
+                        # make this LD_PRELOAD_{bits}
+                        open(FP, "/bin/file $content |");
+                        my $bits = <FP>;
+                        if ($bits =~ /^.+ELF\s(\d\d)-bit.+$/) {
+                            $var .= '_'.$1;
+                        }
                     }
                     $ENV{$var} = "$content";
                 }