t/perf-*.t: use $ENV{GIANT_INBOX_DIR} consistently

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 990233c8ba203a5ce53b4c866c24901c402a7697..c9201213c12482056b48984b2ac39a8c9ffeb8b1 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -5,9 +5,8 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which);
-use File::Temp qw/tempdir/;
 require './t/common.perl';
-my @mods = qw(URI::Escape Plack::Builder IPC::Run Digest::SHA
+my @mods = qw(URI::Escape Plack::Builder Digest::SHA
                IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny);
 foreach my $mod (@mods) {
        eval("require $mod") or plan skip_all => "$mod missing for $0";
@@ -19,15 +18,16 @@ plan skip_all => "JSON module missing: $@" if $@;
 
 use_ok 'PublicInbox::Git';
 
-my $fi_data = './t/git.fast-import-data';
-my $tmpdir = tempdir('www_listing-tmp-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $bare = PublicInbox::Git->new("$tmpdir/bare.git");
 is(system(qw(git init -q --bare), $bare->{git_dir}), 0, 'git init --bare');
 is(PublicInbox::WwwListing::fingerprint($bare), undef,
        'empty repo has no fingerprint');
-
-my $cmd = [ 'git', "--git-dir=$bare->{git_dir}", qw(fast-import --quiet) ];
-ok(IPC::Run::run($cmd, '<', $fi_data), 'fast-import');
+{
+       my $fi_data = './t/git.fast-import-data';
+       local $ENV{GIT_DIR} = $bare->{git_dir};
+       is(system("git fast-import --quiet <$fi_data"), 0, 'fast-import');
+}
 
 like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
        'got fingerprint with non-empty repo');
@@ -63,15 +63,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);
@@ -91,22 +89,22 @@ SKIP: {
        open $fh, '>', $cfgfile or die;
        print $fh <<"" or die;
 [publicinbox "bare"]
-       mainrepo = $bare->{git_dir}
+       inboxdir = $bare->{git_dir}
        url = http://$host/bare
        address = bare\@example.com
 [publicinbox "alt"]
-       mainrepo = $alt
+       inboxdir = $alt
        url = http://$host/alt
        address = alt\@example.com
 [publicinbox "v2"]
-       mainrepo = $v2
+       inboxdir = $v2
        url = http://$host/v2
        address = v2\@example.com
 
        close $fh or die;
        my $env = { PI_CONFIG => $cfgfile };
-       my $cmd = [ $httpd, "--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);