treewide: update to v3 Tor onions

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 49cecacdd2e933666ffe419de8ed2ca6fd206f64..460c9da01ad41596fadf8bb77ff700fee1a32d79 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -12,6 +12,7 @@ use IO::Socket::INET;
 use File::Spec;
 our @EXPORT;
 my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
+our ($lei_opt, $lei_out, $lei_err, $lei_cwdfh);
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
@@ -306,14 +307,16 @@ sub run_script ($;$$) {
                local %SIG = %SIG;
                local $0 = join(' ', @$cmd);
                my $orig_io = _prepare_redirects($fhref);
-               my $cwdfh;
+               my $cwdfh = $lei_cwdfh;
                if (my $d = $opt->{'-C'}) {
-                       opendir $cwdfh, '.' or die "opendir .: $!";
+                       unless ($cwdfh) {
+                               opendir $cwdfh, '.' or die "opendir .: $!";
+                       }
                        chdir $d or die "chdir $d: $!";
                }
                _run_sub($sub, $key, \@argv);
                eval { PublicInbox::Inbox::cleanup_task() };
-               die "chdir(restore): $!" if $cwdfh && !chdir($cwdfh);
+               die "fchdir(restore): $!" if $cwdfh && !chdir($cwdfh);
                _undo_redirects($orig_io);
                select STDOUT;
        }
@@ -321,6 +324,7 @@ sub run_script ($;$$) {
        # slurp the redirects back into user-supplied strings
        for my $fd (1..2) {
                my $fh = $fhref->[$fd] or next;
+               next unless -f $fh;
                seek($fh, 0, SEEK_SET) or die "seek: $!";
                my $redir = $opt->{$fd};
                local $/;
@@ -468,7 +472,6 @@ sub have_xapian_compact () {
        PublicInbox::Spawn::which($ENV{XAPIAN_COMPACT} || 'xapian-compact');
 }
 
-our ($lei_opt, $lei_out, $lei_err);
 # favor lei() or lei_ok() over $lei for new code
 sub lei (@) {
        my ($cmd, $env, $xopt) = @_;
@@ -514,6 +517,8 @@ sub test_lei {
 SKIP: {
        my ($cb) = pop @_;
        my $test_opt = shift // {};
+       local $lei_cwdfh;
+       opendir $lei_cwdfh, '.' or xbail "opendir .: $!";
        require_git(2.6, 1) or skip('git 2.6+ required for lei test', 2);
        require_mods(qw(json DBD::SQLite Search::Xapian), 2);
        require PublicInbox::Config;