Commit 1e038c4b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

valgrind version 3 renames the --logfile command line option to --log-file...

parent 6ba19692
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,11 @@




Daniel (24 August 2005)
Daniel (24 August 2005)
- (Trying hard to exclude emotions now.) valgrind version 3 suddenly renamed
  the --logfile command line option to --log-file, and thus the test script
  valgrind autodetection now has yet another version check to do and then it
  alters the valgrind command line accordingly.

- Fixed CA cert verification using GnuTLS with the default bundle, which
- Fixed CA cert verification using GnuTLS with the default bundle, which
  previously failed due to GnuTLS not allowing x509 v1 CA certs by default.     
  previously failed due to GnuTLS not allowing x509 v1 CA certs by default.     


+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ This release includes the following changes:


This release includes the following bugfixes:
This release includes the following bugfixes:


 o test suite works with valgrind 3
 o CA cert verification with GnuTLS builds
 o CA cert verification with GnuTLS builds
 o handles expiry times in cookie files that go beyond 32 bits in size
 o handles expiry times in cookie files that go beyond 32 bits in size
 o several client problems with files, such as doing -d @file when the file
 o several client problems with files, such as doing -d @file when the file
+11 −1
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ my $memanalyze="./memanalyze.pl";


my $stunnel = checkcmd("stunnel");
my $stunnel = checkcmd("stunnel");
my $valgrind = checkcmd("valgrind");
my $valgrind = checkcmd("valgrind");
my $valgrind_logfile="--logfile";
my $start;
my $start;


my $valgrind_tool;
my $valgrind_tool;
@@ -109,6 +110,15 @@ if($valgrind) {
        $valgrind=0;
        $valgrind=0;
    }
    }
    close(C);
    close(C);

    # valgrind 3 renamed the --logfile option to --log-file!!!
    my $ver=`valgrind --version`;
    # cut off all but digits and dots
    $ver =~ s/[^0-9.]//g;

    if($ver >= 3) {
        $valgrind_logfile="--log-file";
    }
}
}


my $gdb = checkcmd("gdb");
my $gdb = checkcmd("gdb");
@@ -1251,7 +1261,7 @@ sub singletest {
    }
    }


    if($valgrind) {
    if($valgrind) {
        $CMDLINE = "valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 --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";
    $CMDLINE .= "$cmdargs >>$STDOUT 2>>$STDERR";