From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 5/9] test_common: handle '-C' (chdir) spawn option properly
Date: Fri, 16 Apr 2021 16:10:31 -0700 [thread overview]
Message-ID: <20210416231035.31807-6-e@80x24.org> (raw)
In-Reply-To: <20210416231035.31807-1-e@80x24.org>
We use it in t/lei-q-save.t, and were inadvertently writing
to the worktree.
---
lib/PublicInbox/TestCommon.pm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index d506e4b5..465d4b9d 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -288,6 +288,7 @@ sub run_script ($;$$) {
}
if ($run_mode == 0) {
# spawn an independent new process, like real-world use cases:
+ $spawn_opt->{$_} = $opt->{$_} for (qw(-C));
require PublicInbox::Spawn;
my $cmd = [ key2script($key), @argv ];
my $pid = PublicInbox::Spawn::spawn($cmd, $env, $spawn_opt);
@@ -302,8 +303,14 @@ sub run_script ($;$$) {
local %SIG = %SIG;
local $0 = join(' ', @$cmd);
my $orig_io = _prepare_redirects($fhref);
+ my $cwdfh;
+ if (my $d = $opt->{'-C'}) {
+ 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);
_undo_redirects($orig_io);
select STDOUT;
}
next prev parent reply other threads:[~2021-04-16 23:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 23:10 [PATCH 0/9] lei saved search usability improvements Eric Wong
2021-04-16 23:10 ` [PATCH 1/9] lei q: --save preserves relative time queries Eric Wong
2021-04-16 23:10 ` [PATCH 2/9] lei: expose share_path as a method Eric Wong
2021-04-16 23:10 ` [PATCH 3/9] lei: saved searches keyed only by path/URL and format Eric Wong
2021-04-16 23:10 ` [PATCH 4/9] lei_to_mail: cast to URIimap object early Eric Wong
2021-04-16 23:10 ` Eric Wong [this message]
2021-04-17 2:24 ` [SQUASH] test_common: fix -C $DIR with TEST_RUN_MODE=0 Eric Wong
2021-04-17 10:00 ` [PATCH 10/9] lei_query: fix relative path handling on --stdin Eric Wong
2021-04-16 23:10 ` [PATCH 6/9] lei: fix rel2abs Eric Wong
2021-04-16 23:10 ` [PATCH 7/9] lei up: support output destination as arg Eric Wong
2021-04-16 23:10 ` [PATCH 8/9] lei q --save: avoid lei.q.format Eric Wong
2021-04-16 23:10 ` [PATCH 9/9] lei q --save: clobber config file on repeats Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416231035.31807-6-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).