t/common: start_script replaces spawn_listener

[public-inbox.git] / t / www_listing.t

diff --git a/t/www_listing.t b/t/www_listing.t
index 61a059e56cf7aa2b88046d8d81c5f757954d5ea9..9cde357514acbf0651fbec30ca51797d66cabd65 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -64,15 +64,13 @@ sub tiny_test {
                'epoch 1 in description');
 }
 
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+my $td;
 SKIP: {
        my $err = "$tmpdir/stderr.log";
        my $out = "$tmpdir/stdout.log";
        my $alt = "$tmpdir/alt.git";
        my $cfgfile = "$tmpdir/config";
        my $v2 = "$tmpdir/v2";
-       my $httpd = 'blib/script/public-inbox-httpd';
        my $sock = tcp_server();
        ok($sock, 'sock created');
        my ($host, $port) = ($sock->sockhost, $sock->sockport);
@@ -106,8 +104,8 @@ SKIP: {
 
        close $fh or die;
        my $env = { PI_CONFIG => $cfgfile };
-       my $cmd = [ $httpd, '-W0', "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener($env, $cmd, [$sock]);
+       my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       $td = start_script($cmd, $env, { 3 => $sock });
        $sock = undef;
 
        tiny_test($host, $port);