No ext_urls

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

diff --git a/t/run.perl b/t/run.perl
index acd60ff519356de8013788510507aaaa402a30bc..f68dab607f2693c53edb9d517b9ff93150fbae5a 100755 (executable)
--- a/t/run.perl
+++ b/t/run.perl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
@@ -10,15 +10,14 @@
 #
 # 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 v5.12;
 use IO::Handle; # ->autoflush
 use PublicInbox::TestCommon;
 use PublicInbox::Spawn;
 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);
+use POSIX qw(WNOHANG);
 use File::Temp ();
 my $jobs = 1;
 my $repeat = 1;
@@ -52,7 +51,12 @@ $run_log->autoflush(1); # one reader, many writers
 key2sub($_) for @tests; # precache
 
 my ($for_destroy, $lei_env, $lei_daemon_pid, $owner_pid);
-if (!$ENV{TEST_LEI_DAEMON_PERSIST_DIR} &&
+
+# TEST_LEI_DAEMON_PERSIST is currently broken.  I get ECONNRESET from
+# lei even with high kern.ipc.soacceptqueue=1073741823 or SOMAXCONN, not
+# sure why.  Also, testing our internal inotify usage is unreliable
+# because lei-daemon uses a single inotify FD for all clients.
+if ($ENV{TEST_LEI_DAEMON_PERSIST} && !$ENV{TEST_LEI_DAEMON_PERSIST_DIR} &&
                (PublicInbox::Spawn->can('recv_cmd4') ||
                        eval { require Socket::MsgHdr })) {
        $lei_env = {};
@@ -81,6 +85,10 @@ if ($shuffle) {
        @tests = sort {
                ($t->{$b}->{elapsed} // 0) <=> ($t->{$a}->{elapsed} // 0)
        } @tests;
+       say "# top 10 longest tests (`make check' regenerates)";
+       for (@tests[0..9]) {
+               printf "# %0.6f %s\n", $t->{$_}->{elapsed}, $_;
+       }
 }
 
 our $tb = Test::More->builder;
@@ -162,7 +170,8 @@ my $start_worker = sub {
        my ($j, $rd, $wr, $todo) = @_;
        my $pid = fork // DIE "fork: $!";
        if ($pid == 0) {
-               close $wr if $wr;
+               close $wr;
+               $SIG{USR1} = undef; # undo parent $SIG{USR1}
                $worker = $$;
                while (1) {
                        my $r = sysread($rd, my $buf, UINT_SIZE);
@@ -177,7 +186,10 @@ my $start_worker = sub {
                        $tb->reset;
                }
                kill 'USR1', $producer if !$eof; # sets $eof in $producer
-               DIE join('', map { "E: $_\n" } @err) if @err;
+               if (@err) { # write to run_log for $sigchld handler
+                       syswrite($run_log, "$$ @err\n");
+                       DIE join('', map { "E: $_\n" } @err);
+               }
                exit(0);
        } else {
                $pids{$pid} = $j;
@@ -194,15 +206,11 @@ for (my $i = $repeat; $i != 0; $i--) {
        pipe(my ($rd, $wr)) or DIE "pipe: $!";
 
        # fill the queue before forking so children can start earlier
-       my $n = (_POSIX_PIPE_BUF / UINT_SIZE);
-       if ($n >= $#todo) {
-               print $wr join('', map { pack('I', $_) } (0..$#todo)) or DIE;
-               undef $wr;
-       } else { # write what we can...
-               $wr->autoflush(1);
-               print $wr join('', map { pack('I', $_) } (0..$n)) or DIE;
-               $n += 1; # and send more ($n..$#todo), later
-       }
+       $wr->autoflush(1);
+       $wr->blocking(0);
+       my $todo_buf = join('', map { pack('I', $_) } (0..$#todo));
+       my $woff = syswrite($wr, $todo_buf) // DIE "syswrite: $!";
+       substr($todo_buf, 0, $woff, '');
        $eof = undef;
        local $SIG{USR1} = sub { $eof = 1 };
        my $sigchld = sub {
@@ -234,12 +242,13 @@ for (my $i = $repeat; $i != 0; $i--) {
        for (my $j = 0; $j < $jobs; $j++) {
                $start_worker->($j, $rd, $wr, \@todo);
        }
-       if ($wr) {
+       {
                local $SIG{CHLD} = $sigchld;
                # too many tests to fit in the pipe before starting workers,
                # send the rest now the workers are running
-               print $wr join('', map { pack('I', $_) } ($n..$#todo)) or DIE;
-               undef $wr;
+               $wr->blocking(1);
+               print $wr $todo_buf or DIE;
+               close $wr;
        }
 
        $sigchld->(0) while scalar(keys(%pids));
@@ -249,5 +258,8 @@ for (my $i = $repeat; $i != 0; $i--) {
 print $OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;
 if ($lei_env && $$ == $owner_pid) {
        my $opt = { 1 => $OLDOUT, 2 => $OLDERR };
+       my $cur_daemon_pid;
+       run_script([qw(lei daemon-pid)], $lei_env, { 1 => \$cur_daemon_pid });
        run_script([qw(lei daemon-kill)], $lei_env, $opt);
+       DIE "lei daemon restarted\n" if $cur_daemon_pid != $lei_daemon_pid;
 }