From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH 2/5] completion: fix args of run_completion() test helper
Date: Fri, 28 Sep 2012 12:09:32 +0200 [thread overview]
Message-ID: <1348826975-2225-2-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <1348826975-2225-1-git-send-email-szeder@ira.uka.de>
To simulate the the user hit 'git <TAB>, one of the completion tests
sets up the rather strange command line
git ""
i.e. the second word on the command line consists of two double
quotes. However, this is not what happens for real, because after
'git <TAB>' the second word on the command line is just an empty
string. Luckily, the test works nevertheless.
Fix this by passing the command line to run_completion() as separate
words.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
t/t9902-completion.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index e7657537..f5e68834 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -49,7 +49,7 @@ run_completion ()
{
local -a COMPREPLY _words
local _cword
- _words=( $1 )
+ _words=( "$@" )
(( _cword = ${#_words[@]} - 1 ))
__git_wrap__git_main && print_comp
}
@@ -57,7 +57,7 @@ run_completion ()
test_completion ()
{
test $# -gt 1 && echo "$2" > expected
- run_completion "$@" &&
+ run_completion $1 &&
test_cmp expected out
}
@@ -147,7 +147,7 @@ test_expect_success '__gitcomp - suffix' '
'
test_expect_success 'basic' '
- run_completion "git \"\"" &&
+ run_completion git "" &&
# built-in
grep -q "^add \$" out &&
# script
@@ -155,7 +155,7 @@ test_expect_success 'basic' '
# plumbing
! grep -q "^ls-files \$" out &&
- run_completion "git f" &&
+ run_completion git f &&
! grep -q -v "^f" out
'
--
1.7.12.1.438.g7dfa67b
next prev parent reply other threads:[~2012-09-28 10:10 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 2:15 [PATCH] completion: fix shell expansion of items Felipe Contreras
2012-09-20 1:46 ` Jeff King
2012-09-20 16:52 ` Junio C Hamano
2012-09-20 18:11 ` SZEDER Gábor
2012-09-20 18:21 ` Jeff King
2012-09-20 19:38 ` Felipe Contreras
2012-09-25 4:31 ` [PATCH] Revert "completion: fix shell expansion of items" Jeff King
2012-09-25 16:03 ` Junio C Hamano
2012-09-25 22:37 ` SZEDER Gábor
2012-09-25 23:28 ` Junio C Hamano
2012-09-26 21:46 ` Jeff King
2012-09-26 21:47 ` [PATCH 1/3] t9902: add a few basic completion tests Jeff King
2012-09-26 21:51 ` [PATCH 2/3] t9902: add completion tests for "odd" filenames Jeff King
2012-09-26 21:51 ` [PATCH 3/3] completion: improve shell expansion of items Jeff King
2012-09-26 21:57 ` [PATCH 4/3] completion: quote completions we find Jeff King
2012-09-27 21:40 ` SZEDER Gábor
2012-09-27 22:31 ` Junio C Hamano
2012-09-27 22:58 ` SZEDER Gábor
2012-09-27 0:37 ` [PATCH 3/3] completion: improve shell expansion of items SZEDER Gábor
2012-09-27 6:28 ` Jeff King
2012-09-27 6:43 ` Jeff King
2012-09-27 19:48 ` Jeff King
2012-09-28 10:05 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 1/5] completion: fix non-critical bugs in __gitcomp() tests SZEDER Gábor
2012-09-28 10:09 ` SZEDER Gábor [this message]
2012-09-28 18:04 ` [PATCH 2/5] completion: fix args of run_completion() test helper Junio C Hamano
2012-09-28 18:38 ` SZEDER Gábor
2012-09-28 19:23 ` Junio C Hamano
2012-09-28 19:30 ` Jeff King
2012-09-28 19:49 ` Junio C Hamano
2012-09-28 19:55 ` Jeff King
2012-09-28 20:28 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 3/5] completion: add tests for the __gitcomp_nl() completion helper function SZEDER Gábor
2012-09-28 10:09 ` [PATCH 4/5] completion: test __gitcomp() and __gitcomp_nl() with expandable words SZEDER Gábor
2012-09-28 10:09 ` [POC PATCH 5/5] completion: avoid compgen to fix expansion issues in __gitcomp_nl() SZEDER Gábor
2012-09-28 15:08 ` SZEDER Gábor
2012-09-28 15:46 ` Jeff King
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=1348826975-2225-2-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).