[PATCHv2 05/21] git p4 test: avoid loop in client_view
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Jan 27, 2013, 03:11 UTC
- Message-ID
- <1359256284-5660-6-git-send-email-pw@padd.com>
- In-Reply-To
- <1359256284-5660-1-git-send-email-pw@padd.com>
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> --- t/lib-git-p4.sh | 4 +--- 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 890ee60..b1dbded 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 281be29..0b58fb9 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 &&
-- 1.8.1.1.460.g6fa8886