bundle Danga::Socket and Sys::Syscall

[public-inbox.git] / t / git-http-backend.t

diff --git a/t/git-http-backend.t b/t/git-http-backend.t
index e879392341d3de178e272cb482e80ef0afa9b73b..b616e822bfb1fb5cfc2451673429eebce264a1c6 100644 (file)
--- a/t/git-http-backend.t
+++ b/t/git-http-backend.t
@@ -1,23 +1,23 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 use IO::Socket;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
 use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
 use POSIX qw(dup2 setsid);
 use Cwd qw(getcwd);
 
 my $git_dir = $ENV{GIANT_GIT_DIR};
 plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
-foreach my $mod (qw(Danga::Socket
+foreach my $mod (qw(PublicInbox::DS BSD::Resource
                        Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status Net::HTTP)) {
        eval "require $mod";
        plan skip_all => "$mod missing for git-http-backend.t" if $@;
 }
+require './t/common.perl';
 my $psgi = getcwd()."/t/git-http-backend.psgi";
 my $tmpdir = tempdir('pi-git-http-backend-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $err = "$tmpdir/stderr.log";
@@ -51,17 +51,9 @@ my $get_maxrss = sub {
 
 {
        ok($sock, 'sock created');
-       $pid = fork;
-       if ($pid == 0) { # pretend to be systemd
-               fcntl($sock, F_SETFD, 0);
-               dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
-               $ENV{LISTEN_PID} = $$;
-               $ENV{LISTEN_FDS} = 1;
-               $ENV{TEST_CHUNK} = '1';
-               exec $httpd, "--stdout=$out", "--stderr=$err", $psgi;
-               die "FAIL: $!\n";
-       }
-       ok(defined $pid, 'forked httpd process successfully');
+       my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err", $psgi ];
+       ok(defined($pid = spawn_listener(undef, $cmd, [$sock])),
+          'forked httpd process successfully');
 }
 my $mem_a = $get_maxrss->();