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
This commit is contained in:
Daniel Stenberg 2020-02-11 17:36:23 +01:00
parent 81ade13c37
commit 02988b70cd
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2

View File

@ -164,7 +164,7 @@ my $UNITDIR="./unit";
my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server
my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server
my $PROXYIN="$LOGDIR/proxy.input"; # what curl sent the proxy 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 $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here
my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock
my $CURLCONFIG="../curl-config"; # curl-config from current build my $CURLCONFIG="../curl-config"; # curl-config from current build
@ -2561,7 +2561,7 @@ sub cleardir {
opendir(DIR, $dir) || opendir(DIR, $dir) ||
return 0; # can't open dir return 0; # can't open dir
while($file = readdir(DIR)) { while($file = readdir(DIR)) {
if($file !~ /^\./) { if(($file !~ /^\./) && ($file ne $CURLLOG)) {
unlink("$dir/$file"); unlink("$dir/$file");
$count++; $count++;
} }
@ -5405,7 +5405,7 @@ if($scrambleorder) {
####################################################################### #######################################################################
# Start the command line log # Start the command line log
# #
open(CMDLOG, ">$CURLLOG") || open(CMDLOG, ">", "$LOGDIR/$CURLLOG") ||
logmsg "can't log command lines to $CURLLOG\n"; logmsg "can't log command lines to $CURLLOG\n";
####################################################################### #######################################################################