1 files changed, 12 insertions, 4 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index a7ec9b5b..3a67ab54 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -17,9 +17,10 @@ my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
  our $tail_cmd = $ENV{TAIL};
  our ($lei_opt, $lei_out, $lei_err);
  use autodie qw(chdir close fcntl mkdir open opendir seek unlink);
+$ENV{XDG_CACHE_HOME} //= "$ENV{HOME}/.cache"; # reuse C++ xap_helper builds
  
  $_ = File::Spec->rel2abs($_) for (grep(!m!^/!, @INC));
-
+our $CURRENT_DAEMON;
  BEGIN {
          @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                  run_script start_script key2sub xsys xsys_e xqx eml_load tick
@@ -167,7 +168,7 @@ sub require_git_http_backend (;$) {
          my ($nr) = @_;
          state $ok = do {
                  require PublicInbox::Git;
-                my $git = PublicInbox::Git::check_git_exe() or plan
+                my $git = PublicInbox::Git::git_exe() or plan
                          skip_all => 'nothing in public-inbox works w/o git';
                  my $rdr = { 1 => \my $out, 2 => \my $err };
                  xsys([$git, qw(http-backend)], undef, $rdr);
@@ -565,6 +566,9 @@ sub start_script {
          my $run_mode = $ENV{TEST_RUN_MODE} // $opt->{run_mode} // 2;
          my $sub = $run_mode == 0 ? undef : key2sub($key);
          my $tail;
+        my @xh = split(/\s+/, $ENV{TEST_DAEMON_XH} // '');
+        @xh = () if $key !~ /-(?:imapd|netd|httpd|pop3d|nntpd)\z/;
+        push @argv, @xh;
          if ($tail_cmd) {
                  my @paths;
                  for (@argv) {
@@ -612,7 +616,7 @@ sub start_script {
                          $ENV{LISTEN_FDS} = $fds;
                  }
                  if ($opt->{-C}) { chdir($opt->{-C}) }
-                $0 = join(' ', @$cmd);
+                $0 = join(' ', @$cmd, @xh);
                  local @SIG{keys %SIG} = map { undef } values %SIG;
                  local $SIG{FPE} = 'IGNORE'; # Perl default
                  undef $tmp_mask;
@@ -720,7 +724,10 @@ SKIP: {
          require PublicInbox::Spawn;
          require PublicInbox::Config;
          require File::Path;
-
+        eval { # use XDG_CACHE_HOME, first:
+                require PublicInbox::XapHelperCxx;
+                PublicInbox::XapHelperCxx::check_build();
+        };
          local %ENV = %ENV;
          delete $ENV{XDG_DATA_HOME};
          delete $ENV{XDG_CONFIG_HOME};
@@ -945,6 +952,7 @@ sub test_httpd ($$;$$) {
                  local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
                  my $ua = LWP::UserAgent->new;
                  $ua->max_redirect(0);
+                local $CURRENT_DAEMON = $td;
                  Plack::Test::ExternalServer::test_psgi(client => $client,
                                                          ua => $ua);
                  $cb->() if $cb;