www_coderepo: /tree/ 404s search git history

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index abf4f3642b00c0fa57ef5163c8d2676cc6d35d53..b36c71a64cded042ea4d81449359ccbb5454fc93 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -6,7 +6,7 @@ package PublicInbox::TestCommon;
 use strict;
 use parent qw(Exporter);
 use v5.10.1;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
+use Fcntl qw(F_SETFD :seek);
 use POSIX qw(dup2);
 use IO::Socket::INET;
 use File::Spec;
@@ -14,6 +14,9 @@ our @EXPORT;
 my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
 my $tail_cmd = $ENV{TAIL};
 our ($lei_opt, $lei_out, $lei_err, $lei_cwdfh);
+
+$_ = File::Spec->rel2abs($_) for (grep(!m!^/!, @INC));
+
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
@@ -288,6 +291,7 @@ sub run_script ($;$$) {
        my ($cmd, $env, $opt) = @_;
        my ($key, @argv) = @$cmd;
        my $run_mode = $ENV{TEST_RUN_MODE} // $opt->{run_mode} // 1;
+       $run_mode = 0 if $key eq '-clone'; # relies on SIGCHLD + waitpid(-1)
        my $sub = $run_mode == 0 ? undef : key2sub($key);
        my $fhref = [];
        my $spawn_opt = {};
@@ -475,16 +479,14 @@ sub start_script {
                # pretend to be systemd (cf. sd_listen_fds(3))
                # 3 == SD_LISTEN_FDS_START
                my $fd;
-               for ($fd = 0; 1; $fd++) {
-                       my $s = $opt->{$fd};
-                       last if $fd >= 3 && !defined($s);
-                       next unless $s;
-                       my $fl = fcntl($s, F_GETFD, 0);
-                       if (($fl & FD_CLOEXEC) != FD_CLOEXEC) {
-                               warn "got FD:".fileno($s)." w/o CLOEXEC\n";
+               for ($fd = 0; $fd < 3 || defined($opt->{$fd}); $fd++) {
+                       my $io = $opt->{$fd} // next;
+                       my $old = fileno($io);
+                       if ($old == $fd) {
+                               fcntl($io, F_SETFD, 0) // die "F_SETFD: $!";
+                       } else {
+                               dup2($old, $fd) // die "dup2($old, $fd): $!";
                        }
-                       fcntl($s, F_SETFD, $fl &= ~FD_CLOEXEC);
-                       dup2(fileno($s), $fd) or die "dup2 failed: $!\n";
                }
                %ENV = (%ENV, %$env) if $env;
                my $fds = $fd - 3;