From 6617db6a7ed322d28322896aa20bcabf3a479e7c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 17 Jun 2019 14:20:51 +0200 Subject: [PATCH] runtests: keep logfiles around by default Make '-k' a no-op. The singletest function now clears the log directory BEFORE each individual test and not after, which makes it possible to always keep the logfiles around after a test has been run. No need to specify -k anymore. Keeping the option parsing around to work with users of old habits. Some tests also didn't work properly when -k was used (since the old logs would be kep when a new test starts) which this change also fixes. Closes #4035 --- tests/runtests.pl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/runtests.pl b/tests/runtests.pl index 52045ab14..e7ea11c46 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3202,6 +3202,9 @@ sub singletest { my $cmd; my $disablevalgrind; + # fist, remove all lingering log files + cleardir($LOGDIR); + # copy test number to a global scope var, this allows # testnum checking when starting test harness servers. $testnumcheck = $testnum; @@ -3862,9 +3865,6 @@ sub singletest { # Skip all the verification on torture tests if ($torture) { - if(!$cmdres && !$keepoutfiles) { - cleardir($LOGDIR); - } # timestamp test result verification end $timevrfyend{$testnum} = Time::HiRes::time(); return $cmdres; @@ -4295,10 +4295,6 @@ sub singletest { logmsg "PASS: $testnum - $testname\n"; } - # the test succeeded, remove all log files - if(!$keepoutfiles) { - cleardir($LOGDIR); - } return 0; }