15941200 curl "gmake test" failures
authorRich Burridge <rich.burridge@oracle.com>
Wed, 09 Oct 2013 08:48:41 -0700
changeset 1501 8be4b9d44152
parent 1500 10b7d238f48b
child 1502 89c98773d0af
15941200 curl "gmake test" failures
components/curl/patches/009-runtests.pl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/curl/patches/009-runtests.pl.patch	Wed Oct 09 08:48:41 2013 -0700
@@ -0,0 +1,24 @@
+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";
+                 }