diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-06-27 12:00:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 04:06:34 (GMT) |
| commit | 08c5eb7ac0167e5932f2456df3dcebd0712d63a9 (patch) | |
| tree | d24129e9b3be83e7eee0136d8ec578b2fa2e26fd /t/t9800-git-p4-basic.sh | |
| parent | 23bd0c99f7b789077c40ae5384dd0054ef5c00ac (diff) | |
| download | git-08c5eb7ac0167e5932f2456df3dcebd0712d63a9.zip git-08c5eb7ac0167e5932f2456df3dcebd0712d63a9.tar.gz git-08c5eb7ac0167e5932f2456df3dcebd0712d63a9.tar.bz2 | |
git p4 test: simplify quoting involving TRASH_DIRECTORY
For temporary files that are created in the top-level TRASH_DIRECTORY,
trust that the tests do not chdir except in subshells, and avoid some
quoting.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9800-git-p4-basic.sh')
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 0f410c4..7401c21 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -126,15 +126,14 @@ test_expect_success 'clone two dirs, @all, conflicting files' ' ' test_expect_success 'exit when p4 fails to produce marshaled output' ' - badp4dir="$TRASH_DIRECTORY/badp4dir" && - mkdir "$badp4dir" && - test_when_finished "rm \"$badp4dir/p4\" && rmdir \"$badp4dir\"" && - cat >"$badp4dir"/p4 <<-EOF && + mkdir badp4dir && + test_when_finished "rm badp4dir/p4 && rmdir badp4dir" && + cat >badp4dir/p4 <<-EOF && #!$SHELL_PATH exit 1 EOF - chmod 755 "$badp4dir"/p4 && - PATH="$badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? && + 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 ' |