From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4C22E1F5AE for ; Sat, 24 Apr 2021 20:09:36 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] test_common: don't attempt to seek on pipes and terminals Date: Sat, 24 Apr 2021 20:09:36 +0000 Message-Id: <20210424200936.27326-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This allows proper error reporting on daemon failure when using "check-run". --- lib/PublicInbox/TestCommon.pm | 1 + t/run.perl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 49cecacd..09256852 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -321,6 +321,7 @@ sub run_script ($;$$) { # slurp the redirects back into user-supplied strings for my $fd (1..2) { my $fh = $fhref->[$fd] or next; + next unless -f $fh; seek($fh, 0, SEEK_SET) or die "seek: $!"; my $redir = $opt->{$fd}; local $/; diff --git a/t/run.perl b/t/run.perl index 1fb1c5f0..f4e235b7 100755 --- a/t/run.perl +++ b/t/run.perl @@ -225,6 +225,6 @@ 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 $opt = { 1 => $OLDOUT, 2 => $OLDERR }; run_script([qw(lei daemon-kill)], $lei_env, $opt); }