From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>
Subject: [PATCH v2 6/6] completion: simplify __gitcomp() test helper
Date: Sun, 11 Nov 2012 15:35:58 +0100 [thread overview]
Message-ID: <1352644558-9410-7-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1352644558-9410-1-git-send-email-felipe.contreras@gmail.com>
By using print_comp as suggested by SZEDER Gábor.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t9902-completion.sh | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 66c7af6..9b38b69 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -69,23 +69,18 @@ test_completion ()
test_cmp expected out
}
-newline=$'\n'
-
# Test __gitcomp.
# Arguments are:
# 1: typed text so far (cur)
# *: arguments to pass to __gitcomp
test_gitcomp ()
{
+ local -a COMPREPLY &&
sed -e 's/Z$//' > expected &&
- (
- local -a COMPREPLY &&
- cur="$1" &&
- shift &&
- __gitcomp "$@" &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
- ) &&
+ cur="$1" &&
+ shift &&
+ __gitcomp "$@" &&
+ print_comp &&
test_cmp expected out
}
--
1.8.0
prev parent reply other threads:[~2012-11-11 14:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-11 14:35 [PATCH v2 0/6] completion: test consolidations Felipe Contreras
2012-11-11 14:35 ` [PATCH v2 1/6] completion: add comment for test_completion() Felipe Contreras
2012-11-16 20:54 ` SZEDER Gábor
2012-11-16 21:06 ` Felipe Contreras
2012-11-16 21:09 ` Felipe Contreras
2012-11-11 14:35 ` [PATCH v2 2/6] completion: standardize final space marker in tests Felipe Contreras
2012-11-11 14:35 ` [PATCH v2 3/6] completion: simplify tests using test_completion_long() Felipe Contreras
2012-11-11 14:35 ` [PATCH v2 4/6] completion: consolidate test_completion*() tests Felipe Contreras
2012-11-16 23:41 ` Junio C Hamano
2012-11-17 20:26 ` Felipe Contreras
2012-11-11 14:35 ` [PATCH v2 5/6] completion: refactor __gitcomp related tests Felipe Contreras
2012-11-16 19:13 ` Junio C Hamano
2012-11-16 19:53 ` Felipe Contreras
2012-11-16 21:02 ` SZEDER Gábor
2012-11-16 23:40 ` Junio C Hamano
2012-11-11 14:35 ` Felipe Contreras [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352644558-9410-7-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).