undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git p4 test: keep P4CLIENT changes inside subshells

Browse Source 
Tests assume that this is set to something valid.  Make sure
that the 'clone --use-client-spec' does not leak its changes
out into the rest of the tests.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2013-01-14 19:47:07 -05:00 committed by Junio C Hamano
parent 8c9e8b6e75
commit af8c009250
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t9806-git-p4-options.sh
View File

@ -226,9 +226,11 @@ test_expect_success 'clone --use-client-spec' '
View: //depot/sub/... //client2/bus/... View: //depot/sub/... //client2/bus/...
EOF EOF
) && ) &&
P4CLIENT=client2 &&
test_when_finished cleanup_git && test_when_finished cleanup_git &&
git p4 clone --dest="$git" --use-client-spec //depot/... && (
P4CLIENT=client2 &&
git p4 clone --dest="$git" --use-client-spec //depot/...
) &&
( (
cd "$git" && cd "$git" &&
test_path_is_file bus/dir/f4 && test_path_is_file bus/dir/f4 &&
@ -241,6 +243,7 @@ test_expect_success 'clone --use-client-spec' '
cd "$git" && cd "$git" &&
git init && git init &&
git config git-p4.useClientSpec true && git config git-p4.useClientSpec true &&
P4CLIENT=client2 &&
git p4 sync //depot/... && git p4 sync //depot/... &&
git checkout -b master p4/master && git checkout -b master p4/master &&
test_path_is_file bus/dir/f4 && test_path_is_file bus/dir/f4 &&