Make the debug build get the debug dump file path from the environment

variable to allow the test suite to better control where it ends up.

diff --git a/src/main.c b/src/main.c
index 14f34fac12959292db9b7fc27f358fa73e9a2f0d..12ff3db9124fa34e9ffc5ed5b10d22eb250b18e2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2933,8 +2933,9 @@ operate(struct Configurable *config, int argc, char *argv[])
   /* this sends all memory debug messages to a logfile named memdump */
   env = curlx_getenv("CURL_MEMDEBUG");
   if(env) {
+    /* use the value as file name */
+    curl_memdebug(env);
     curl_free(env);
-    curl_memdebug("memdump");
   }
   env = curlx_getenv("CURL_MEMLIMIT");
   if(env) {

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 90e24729353015661f197afe5e10efb85ef545a9..e26da06c90b34750730ddc923e8d998737153089 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -78,7 +78,7 @@ my $perl="perl -I$srcdir";
 my $curl_debug=0;
 
 # name of the file that the memory debugging creates:
-my $memdump="memdump";
+my $memdump="$LOGDIR/memdump";
 
 # the path to the script that analyzes the memory debug output file:
 my $memanalyze="./memanalyze.pl";
@@ -135,7 +135,7 @@ my $tortalloc;
 chomp($pwd = `pwd`);
 
 # enable memory debugging if curl is compiled with it
-$ENV{'CURL_MEMDEBUG'} = 1;
+$ENV{'CURL_MEMDEBUG'} = $memdump;
 $ENV{'HOME'}=$pwd;
 
 ##########################################################################