aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-01-27 15:51:03 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-01-27 15:51:03 +0000
commit289a42f050447ab7d0ec0d9c276e867a37be2430 (patch)
tree7bd20c99ba7d1fe0abe884931cfb9d8523b477ee
parentade1e79b376dd614c883682bd2e4b296bd596aa1 (diff)
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.
-rw-r--r--src/main.c3
-rwxr-xr-xtests/runtests.pl4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 14f34fac1..12ff3db91 100644
--- 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 90e247293..e26da06c9 100755
--- 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;
##########################################################################