diff options
| author | Pete Wyckoff <pw@padd.com> | 2013-01-26 22:11:08 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-26 22:00:38 -0800 |
| commit | 6112541b444b52d5ac83f491eabefbf571da4997 (patch) | |
| tree | b18fb5488f0545a92c91c30f0e40104b72905470 | |
| parent | daa38f4ae0afdc6357c547d2f6bd5270e1e4151a (diff) | |
| download | git-6112541b444b52d5ac83f491eabefbf571da4997.tar.gz | |
git p4 test: avoid loop in client_view
The printf command re-interprets the format string as
long as there are arguments to consume. Use this to
simplify a for loop in the client_view() library function.
This requires a fix to one of the client_view callers.
An errant \n in the string was converted into a harmless
newline in the input to "p4 client -i", but now shows up
as a literal \n as passed through by "%s". Remove the \n.
Based-on-patch-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-git-p4.sh | 4 | ||||
| -rwxr-xr-x | t/t9809-git-p4-client-view.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 890ee60708..b1dbded3e8 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -121,8 +121,6 @@ client_view() { Root: $cli View: EOF - for arg ; do - printf "\t$arg\n" - done + printf "\t%s\n" "$@" ) | p4 client -i } diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh index 281be29174..0b58fb96f0 100755 --- a/t/t9809-git-p4-client-view.sh +++ b/t/t9809-git-p4-client-view.sh @@ -196,7 +196,7 @@ test_expect_success 'exclusion single file' ' test_expect_success 'overlay wildcard' ' client_view "//depot/dir1/... //client/cli/..." \ - "+//depot/dir2/... //client/cli/...\n" && + "+//depot/dir2/... //client/cli/..." && files="cli/file11 cli/file12 cli/file21 cli/file22" && client_verify $files && test_when_finished cleanup_git && |