diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-02-11 17:36:23 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-02-27 17:09:49 +0100 |
| commit | 02988b70cdd9f279d0024d1c4647b2e35ad40c52 (patch) | |
| tree | b60d40e3ce9681d84fbd19a6ffe2d21ffa6a5f8b | |
| parent | 81ade13c373c9569074e6f881fe9348123a7ed7c (diff) | |
| download | curl-02988b70cdd9f279d0024d1c4647b2e35ad40c52.tar.gz | |
runtests: restore the command log
The log file with all command lines for the invoked command lines is now
called logs/commands.log
Fixes #4911
Closes #4989
| -rwxr-xr-x | tests/runtests.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 61953ea64..2fcd35fbc 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -164,7 +164,7 @@ my $UNITDIR="./unit"; my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server my $PROXYIN="$LOGDIR/proxy.input"; # what curl sent the proxy -my $CURLLOG="$LOGDIR/curl.log"; # all command lines run +my $CURLLOG="commands.log"; # all command lines run my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock my $CURLCONFIG="../curl-config"; # curl-config from current build @@ -2561,7 +2561,7 @@ sub cleardir { opendir(DIR, $dir) || return 0; # can't open dir while($file = readdir(DIR)) { - if($file !~ /^\./) { + if(($file !~ /^\./) && ($file ne $CURLLOG)) { unlink("$dir/$file"); $count++; } @@ -5405,7 +5405,7 @@ if($scrambleorder) { ####################################################################### # Start the command line log # -open(CMDLOG, ">$CURLLOG") || +open(CMDLOG, ">", "$LOGDIR/$CURLLOG") || logmsg "can't log command lines to $CURLLOG\n"; ####################################################################### |