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

git p4 test: use client_view in t9806

Browse Source 
Use the standard client_view function from lib-git-p4.sh
instead of building one by hand.  This requires a bit of
rework, using the current value of $P4CLIENT for the client
name.  It also reorganizes the test to isolate changes to
$P4CLIENT and $cli in a subshell.

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-26 22:11:09 -05:00 committed by Junio C Hamano
parent 6112541b44
commit 50038ba92a
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/lib-git-p4.sh
View File

@ -116,8 +116,8 @@ marshal_dump() {
client_view() { client_view() {
( (
cat <<-EOF && cat <<-EOF &&
Client: client Client: $P4CLIENT
Description: client Description: $P4CLIENT
Root: $cli Root: $cli
View: View:
EOF EOF

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

@ -214,40 +214,33 @@ test_expect_success 'clone --use-client-spec' '
exec >/dev/null && exec >/dev/null &&
test_must_fail git p4 clone --dest="$git" --use-client-spec test_must_fail git p4 clone --dest="$git" --use-client-spec
) && ) &&
# build a different client
cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") && cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") &&
mkdir -p "$cli2" && mkdir -p "$cli2" &&
test_when_finished "rmdir \"$cli2\"" && test_when_finished "rmdir \"$cli2\"" &&
(
cd "$cli2" &&
p4 client -i <<-EOF
Client: client2
Description: client2
Root: $cli2
View: //depot/sub/... //client2/bus/...
EOF
) &&
test_when_finished cleanup_git && test_when_finished cleanup_git &&
( (
# group P4CLIENT and cli changes in a sub-shell
P4CLIENT=client2 && P4CLIENT=client2 &&
git p4 clone --dest="$git" --use-client-spec //depot/... cli="$cli2" &&
) && client_view "//depot/sub/... //client2/bus/..." &&
( git p4 clone --dest="$git" --use-client-spec //depot/... &&
cd "$git" && (
test_path_is_file bus/dir/f4 && cd "$git" &&
test_path_is_missing file1 test_path_is_file bus/dir/f4 &&
) && test_path_is_missing file1
cleanup_git && ) &&
cleanup_git &&
# same thing again, this time with variable instead of option # same thing again, this time with variable instead of option
( (
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 && test_path_is_missing file1
test_path_is_missing file1 )
) )
' '