imaptracker: preserve WAL journal_mode if set by user

[public-inbox.git] / t / run.perl

diff --git a/t/run.perl b/t/run.perl
index 9f987a6f8df7600a70c12bcd3d5e0c6b0fd042f6..b1a0d2fe154c844b1c4e198468e5061cfd117288 100755 (executable)
--- a/t/run.perl
+++ b/t/run.perl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Parallel test runner which preloads code and reuses worker processes
@@ -26,7 +26,7 @@ GetOptions('j|jobs=i' => \$jobs,
        'log=s' => \$log_suffix,
        's|shuffle' => \$shuffle,
 ) or die "Usage: $0 [-j JOBS] [--log=SUFFIX] [--repeat RUNS]";
-if (($ENV{TEST_RUN_MODE} // 1) == 0) {
+if (($ENV{TEST_RUN_MODE} // 2) == 0) {
        die "$0 is not compatible with TEST_RUN_MODE=0\n";
 }
 my @tests = scalar(@ARGV) ? @ARGV : glob('t/*.t');
@@ -61,7 +61,19 @@ our ($worker, $worker_test);
 sub test_status () {
        $? = 255 if $? == 0 && !$tb->is_passing;
        my $status = $? ? 'not ok' : 'ok';
-       print OLDOUT "$status $worker_test\n" if $log_suffix ne '';
+       chdir($cwd) or DIE "chdir($cwd): $!";
+       if ($log_suffix ne '') {
+               my $log = $worker_test;
+               $log =~ s/\.t\z/$log_suffix/;
+               if (open my $fh, '<', $log) {
+                       my @not_ok = grep(!/^(?:ok |[ \t]*#)/ms, <$fh>);
+                       pop @not_ok if $not_ok[-1] =~ /^[0-9]+\.\.[0-9]+$/;
+                       print OLDERR map { "# $log: $_" } @not_ok;
+               } else {
+                       print OLDERR "could not open: $log: $!\n";
+               }
+               print OLDOUT "$status $worker_test\n";
+       }
 }
 
 # Test::Builder or Test2::Hub may call exit() from plan(skip_all => ...)
@@ -112,7 +124,6 @@ my $start_worker = sub {
                        my $t = unpack('I', $buf);
                        run_test($todo->[$t]);
                        $tb->reset;
-                       chdir($cwd) or DIE "chdir: $!";
                }
                kill 'USR1', $producer if !$eof; # sets $eof in $producer
                DIE join('', map { "E: $_\n" } @err) if @err;