use defined-or in a few more places

[public-inbox.git] / lib / PublicInbox / TestCommon.pm

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b833984d95d966172ceebd6ae258f2bd90e7c2ce..40c2dc9e6ddba404854f443b1a48b1b0fbd6fc0f 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # internal APIs used only for tests
@@ -141,9 +141,9 @@ sub _prepare_redirects ($) {
        for (my $fd = 0; $fd <= $#io_mode; $fd++) {
                my $fh = $fhref->[$fd] or next;
                my ($oldfh, $mode) = @{$io_mode[$fd]};
-               open my $orig, $mode, $oldfh or die "$$oldfh $mode stash: $!";
+               open my $orig, $mode, $oldfh or die "$oldfh $mode stash: $!";
                $orig_io->[$fd] = $orig;
-               open $oldfh, $mode, $fh or die "$$oldfh $mode redirect: $!";
+               open $oldfh, $mode, $fh or die "$oldfh $mode redirect: $!";
        }
        $orig_io;
 }
@@ -254,8 +254,7 @@ sub run_script ($;$$) {
                my $cmd = [ key2script($key), @argv ];
                my $pid = PublicInbox::Spawn::spawn($cmd, $env, $spawn_opt);
                if (defined $pid) {
-                       my $r = waitpid($pid, 0);
-                       defined($r) or die "waitpid: $!";
+                       my $r = waitpid($pid, 0) // die "waitpid: $!";
                        $r == $pid or die "waitpid: expected $pid, got $r";
                }
        } else { # localize and run everything in the same process:
@@ -367,7 +366,7 @@ sub start_script {
                        }
                }
                if (@paths) {
-                       defined($tail_pid = fork) or die "fork: $!\n";
+                       $tail_pid = fork // die "fork: $!";
                        if ($tail_pid == 0) {
                                # make sure files exist, first
                                open my $fh, '>>', $_ for @paths;
@@ -378,7 +377,7 @@ sub start_script {
                        wait_for_tail($tail_pid, scalar @paths);
                }
        }
-       defined(my $pid = fork) or die "fork: $!\n";
+       my $pid = fork // die "fork: $!\n";
        if ($pid == 0) {
                eval { PublicInbox::DS->Reset };
                # pretend to be systemd (cf. sd_listen_fds(3))
@@ -440,8 +439,7 @@ sub join {
        my ($self, $sig) = @_;
        my $pid = delete $self->{pid} or return;
        CORE::kill($sig, $pid) if defined $sig;
-       my $ret = waitpid($pid, 0);
-       defined($ret) or die "waitpid($pid): $!";
+       my $ret = waitpid($pid, 0) // die "waitpid($pid): $!";
        $ret == $pid or die "waitpid($pid) != $ret";
 }