summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-02-11 17:36:23 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-02-27 14:19:37 +0100
commitdb9bf10f1acfb9dbd93d7b8c56cc2efe67772135 (patch)
tree5de5126cce282129dfb1bf7a0ee37bed1e36ad32
parent1d1e9e8ad7a5f35818dc7072e6fbe8a76a93e018 (diff)
downloadcurl-bagder/runtests-cmdlog.tar.gz
runtests: restore the command logbagder/runtests-cmdlog
The log file with all command lines for the invoked command lines is now called logs/commands.log Fixes #4911
-rwxr-xr-xtests/runtests.pl6
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";
#######################################################################