From: Pete Wyckoff <pw@padd.com>
Date: Wed, 27 Jun 2012 12:01:03 +0000 (-0400)
Subject: git p4 test: fix badp4dir test
X-Git-Tag: v1.7.12-rc0~33^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0327c0edc7ada60ae2af5ec8daa5dcfcacd095d;p=git.git

git p4 test: fix badp4dir test

The construct used to get the return code was flawed, in that
errors in the &&-chain before the semicolon were not caught.  Use
the standard test_expect_code instead.

Set PATH in a subshell instead of relying on the bashism of
setting it just for a single command.

And fix the grep line so it doesn't worry about grep segfaults,
and doesn't fail for i18n issues.

Reported-by: Johannes Sixt <j.sixt@viscovery.net>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index befd82342..07c2e157c 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -134,9 +134,13 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
 	exit 1
 	EOF
 	chmod 755 badp4dir/p4 &&
-	PATH="$TRASH_DIRECTORY/badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&
-	test $retval -eq 1 &&
-	test_must_fail grep -q Traceback errs
+	(
+		PATH="$TRASH_DIRECTORY/badp4dir:$PATH" &&
+		export PATH &&
+		test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
+	) &&
+	cat errs &&
+	! test_i18ngrep Traceback errs
 '
 
 test_expect_success 'clone bare' '