X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fruntest;h=745b360cf5e6e14528cd2f1ee47af3c0c9281c7a;hb=0aca614ff6a0fb631e4e3fb02c6f13ab5febcbed;hp=b82b6b98ccf4ea5dd88ef733d8431469deb6937b;hpb=1a13c13c325cdb119fdf68a6d9ecffcaa2c3756d;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/test/runtest b/test/runtest index b82b6b98c..745b360cf 100755 --- a/test/runtest +++ b/test/runtest @@ -1278,8 +1278,8 @@ if (! -e $sf_current) log_failure($log_failed_filename, $testno, $rf); log_test($log_summary_filename, $testno, 'F') if ($force_continue); } - return 1 if /^c$/i; - last if (/^s$/); + return 1 if /^c$/i && $rf !~ /paniclog/ && $rsf !~ /paniclog/; + last if (/^[sc]$/); } foreach $f ($rf, $rsf) @@ -3853,13 +3853,13 @@ foreach $test (@test_list) # command was run and waited for, and 3 if a command # was run and not waited for (usually a daemon or server startup). + $0 = "[runtest $testno]"; + my($commandname) = ''; my($expectrc) = 0; my($rc, $run_extra) = run_command($testno, \$subtestno, \$expectrc, \$commandname, $TEST_STATE); my($cmdrc) = $?; - $0 = "[runtest $testno]"; - if ($debug) { print ">> rc=$rc cmdrc=$cmdrc\n"; if (defined $run_extra) {