git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] t3404: make test 57 work with dash and others
@ 2012-07-04 11:32 Michael J Gruber
  2012-07-05 22:29 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Michael J Gruber @ 2012-07-04 11:32 UTC (permalink / raw
  To: git; +Cc: Chris Webb

The construct

VAR=value test_must_fail command args

works only for some shells (such as bash) but not others (such as dash)
because VAR=value does not end up in the environment for command when it
is called by the shell function test_must_fail. That is why we write

( VAR=value &&
export VAR &&
test_must_fail command args)

in most places already, bar the newly introduced 57 from
b64b7fe (Add tests for rebase -i --root without --onto, 2012-06-26).

Make test 57 use that construct also.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t3404-rebase-interactive.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 6ffc9c2..2f060ec 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -777,7 +777,9 @@ test_expect_success 'rebase -i --root retain root commit author and message' '
 
 test_expect_success 'rebase -i --root temporary sentinel commit' '
 	git checkout B &&
-	FAKE_LINES="2" test_must_fail git rebase -i --root &&
+	( FAKE_LINES="2" &&
+	export FAKE_LINES &&
+	test_must_fail git rebase -i --root ) &&
 	git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
 	git rebase --abort
 '
-- 
1.7.11.1.214.g6a2db03

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] t3404: make test 57 work with dash and others
  2012-07-04 11:32 [PATCH] t3404: make test 57 work with dash and others Michael J Gruber
@ 2012-07-05 22:29 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2012-07-05 22:29 UTC (permalink / raw
  To: Michael J Gruber; +Cc: git, Chris Webb

Thanks!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-05 22:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-04 11:32 [PATCH] t3404: make test 57 work with dash and others Michael J Gruber
2012-07-05 22:29 ` Junio C Hamano

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.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).