Testsuite: Add EXIM_TEST_NUMBER to the environment

[user/henk/code/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index b82b6b98ccf4ea5dd88ef733d8431469deb6937b..4aa7b864ff12472135922170be606a21642fda58 100755 (executable)
--- 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,14 @@ 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]";
+    $ENV{EXIM_TEST_NUMBER} = $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) {