Michal Marek fixed the test script to be able to use valgrind even when the

lib is built shared with libtool.

diff --git a/CHANGES b/CHANGES
index ab7cce15bbac6c9093847dc9ad757f32cc1a8825..79f34708418f808e90eef6caf8904a6f19662586 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel S (25 October 2007)
+- Michal Marek fixed the test script to be able to use valgrind even when the
+  lib is built shared with libtool.
+
 - Fixed a few memory leaks when the same easy handle is re-used to request
   URLs with different protocols. FTP and TFTP related leaks. Caught thanks to
   Dan F's new test cases.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index efd7e730a61cb69145f82fd908b51626c4763601..962bff7d7073dc0f5b48a4c6019e9c40658236d8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -44,6 +44,7 @@ This release includes the following bugfixes:
  o re-used connections a bit too much when using non-SSL protocols tunneled
    over a HTTP proxy
  o embed the manifest in VC8 builds
+ o use valgrind in the tests even when the lib is built shared with libtool
 
 This release includes the following known bugs:
 

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 71a02c9f6124dad3ff6c0eb6a6ce50449f49868a..875d8baa6726a11cbbb1488005bdc551d97cd63c 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1747,7 +1747,7 @@ sub singletest {
     }
 
     if($valgrind) {
-        $CMDLINE = "valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 ${valgrind_logfile}=log/valgrind$testnum $CMDLINE";
+        $CMDLINE = "$valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 ${valgrind_logfile}=log/valgrind$testnum $CMDLINE";
     }
 
     $CMDLINE .= "$cmdargs >>$STDOUT 2>>$STDERR";
@@ -2537,10 +2537,8 @@ if($valgrind) {
        open(C, "<$CURL");
        my $l = <C>;
        if($l =~ /^\#\!/) {
-           # The first line starts with "#!" which implies a shell-script.
-           # This means libcurl is built shared and curl is a wrapper-script
-           # Disable valgrind in this setup
-           $valgrind=0;
+           # A shell script. This is typically when built with libtool,
+           $valgrind="../libtool --mode=execute $valgrind";
        }
        close(C);