X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Frun.perl;h=b7cb988be3e9b1f123ed484d0fc2ddc0b8e1e128;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=017ca3e82c72be9f2e0665be26121129b3f9ac75;hpb=cffc7d4fc1c36169654f8447b23b3c5c43830eed;p=public-inbox.git
diff --git a/t/run.perl b/t/run.perl
index 017ca3e8..b7cb988b 100755
--- a/t/run.perl
+++ b/t/run.perl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
#
# Parallel test runner which preloads code and reuses worker processes
@@ -11,10 +11,13 @@
# Usage: $PERL -I lib -w t/run.perl -j4
# Or via prove(1): prove -lvw t/run.perl :: -j4
use strict;
+use v5.10.1;
+use IO::Handle; # ->autoflush
use PublicInbox::TestCommon;
use Cwd qw(getcwd);
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
use Errno qw(EINTR);
+use Fcntl qw(:seek);
use POSIX qw(_POSIX_PIPE_BUF WNOHANG);
my $jobs = 1;
my $repeat = 1;
@@ -31,10 +34,10 @@ if (($ENV{TEST_RUN_MODE} // 2) == 0) {
}
my @tests = scalar(@ARGV) ? @ARGV : glob('t/*.t');
my $cwd = getcwd();
-open OLDOUT, '>&STDOUT' or die "dup STDOUT: $!";
-open OLDERR, '>&STDERR' or die "dup STDERR: $!";
-OLDOUT->autoflush(1);
-OLDERR->autoflush(1);
+open my $OLDOUT, '>&STDOUT' or die "dup STDOUT: $!";
+open my $OLDERR, '>&STDERR' or die "dup STDERR: $!";
+$OLDOUT->autoflush(1);
+$OLDERR->autoflush(1);
key2sub($_) for @tests; # precache
@@ -52,7 +55,7 @@ if ($shuffle) {
our $tb = Test::More->builder;
sub DIE (;$) {
- print OLDERR @_;
+ print $OLDERR @_;
exit(1);
}
@@ -61,7 +64,34 @@ 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/;
+ my $skip = '';
+ if (open my $fh, '<', $log) {
+ my @not_ok = grep(!/^(?:ok |[ \t]*#)/ms, <$fh>);
+ my $last = $not_ok[-1] // '';
+ pop @not_ok if $last =~ /^[0-9]+\.\.[0-9]+$/;
+ my $pfx = "# $log: ";
+ print $OLDERR map { $pfx.$_ } @not_ok;
+ seek($fh, 0, SEEK_SET) or die "seek: $!";
+
+ # show unique skip texts and the number of times
+ # each text was skipped
+ local $/;
+ my @sk = (<$fh> =~ m/^ok [0-9]+ (# skip [^\n]+)/mgs);
+ if (@sk) {
+ my %nr;
+ my @err = grep { !$nr{$_}++ } @sk;
+ print $OLDERR "$pfx$_ ($nr{$_})\n" for @err;
+ $skip = ' # total skipped: '.scalar(@sk);
+ }
+ } else {
+ print $OLDERR "could not open: $log: $!\n";
+ }
+ print $OLDOUT "$status $worker_test$skip\n";
+ }
}
# Test::Builder or Test2::Hub may call exit() from plan(skip_all => ...)
@@ -112,7 +142,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;
@@ -156,7 +185,7 @@ for (my $i = $repeat; $i != 0; $i--) {
push @err, "job[$j] ($?)" if $?;
# skip_all can exit(0), respawn if needed:
if (!$eof) {
- print OLDERR "# respawning job[$j]\n";
+ print $OLDERR "# respawning job[$j]\n";
$start_worker->($i, $j, $rd, \@todo);
}
}
@@ -179,4 +208,4 @@ for (my $i = $repeat; $i != 0; $i--) {
DIE join('', map { "E: $_\n" } @err) if @err;
}
-print OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;
+print $OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;