diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-06-27 08:01:03 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-27 21:06:35 -0700 |
| commit | a0327c0edc7ada60ae2af5ec8daa5dcfcacd095d (patch) | |
| tree | 38174de954b8a413be05d9c803c808dbf59a44f5 | |
| parent | 9b6513ac6fde1552a9a3d606be704eb5ded43ac0 (diff) | |
| download | git-a0327c0edc7ada60ae2af5ec8daa5dcfcacd095d.tar.gz git-a0327c0edc7ada60ae2af5ec8daa5dcfcacd095d.tar.xz | |
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>
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 10 |
1 files changed, 7 insertions, 3 deletions
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' ' |