kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-p4: fix test for unsupported P4 Client Views 

Change re method in test for unsupported Client View types
(containing %% or *) anywhere in the string rather than
at the begining.

[pw: two tests now succeed]

Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Gary Gibbons 2012-01-02 18:05:50 -05:00 committed by Junio C Hamano
parent c700b684cf
commit b10048d0e9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/fast-import/git-p4
View File

@ -1889,9 +1889,12 @@ class P4Sync(Command, P4UserMap):


# p4 has these %%1 to %%9 arguments in specs to # p4 has these %%1 to %%9 arguments in specs to
# reorder paths; which we can't handle (yet :) # reorder paths; which we can't handle (yet :)
if re.match('%%\d', v) != None: if re.search('%%\d', v) != None:
print "Sorry, can't handle %%n arguments in client specs" print "Sorry, can't handle %%n arguments in client specs"
sys.exit(1) sys.exit(1)
if re.search('\*', v) != None:
print "Sorry, can't handle * mappings in client specs"
sys.exit(1)


if v.startswith('"'): if v.startswith('"'):
start = 1 start = 1

4
t/t9809-git-p4-client-view.sh
View File

@ -89,13 +89,13 @@ test_expect_success 'init depot' '
' '


# double % for printf # double % for printf
test_expect_failure 'unsupported view wildcard %%n' ' test_expect_success 'unsupported view wildcard %%n' '
client_view "//depot/%%%%1/sub/... //client/sub/%%%%1/..." && client_view "//depot/%%%%1/sub/... //client/sub/%%%%1/..." &&
test_when_finished cleanup_git && test_when_finished cleanup_git &&
test_must_fail "$GITP4" clone --use-client-spec --dest="$git" //depot test_must_fail "$GITP4" clone --use-client-spec --dest="$git" //depot
' '


test_expect_failure 'unsupported view wildcard *' ' test_expect_success 'unsupported view wildcard *' '
client_view "//depot/*/bar/... //client/*/bar/..." && client_view "//depot/*/bar/... //client/*/bar/..." &&
test_when_finished cleanup_git && test_when_finished cleanup_git &&
test_must_fail "$GITP4" clone --use-client-spec --dest="$git" //depot test_must_fail "$GITP4" clone --use-client-spec --dest="$git" //depot