]> Sergey Matveev's repositories - public-inbox.git/commitdiff
tests: check-run: show skipped tests
authorEric Wong <e@yhbt.net>
Fri, 28 Aug 2020 10:13:00 +0000 (10:13 +0000)
committerEric Wong <e@yhbt.net>
Fri, 28 Aug 2020 22:19:28 +0000 (22:19 +0000)
We'll deduplicate redundant lines and show counts of skipped
tests to ensure it's easy to notice if something is unexpectedly
skipped.

t/run.perl

index b1a0d2fe154c844b1c4e198468e5061cfd117288..e3e3e07512fbd852edd1e0233399e2955c526a6a 100755 (executable)
@@ -15,6 +15,7 @@ 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;
@@ -65,14 +66,31 @@ sub test_status () {
        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>);
                        pop @not_ok if $not_ok[-1] =~ /^[0-9]+\.\.[0-9]+$/;
-                       print OLDERR map { "# $log: $_" } @not_ok;
+                       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;
+                               $nr{$_}++ for @sk;
+                               for (@sk) {
+                                       my $n = delete $nr{$_} or next;
+                                       print OLDERR "$pfx$_ ($n)\n";
+                               }
+                               $skip = ' # total skipped: '.scalar(@sk);
+                       }
                } else {
                        print OLDERR "could not open: $log: $!\n";
                }
-               print OLDOUT "$status $worker_test\n";
+               print OLDOUT "$status $worker_test$skip\n";
        }
 }