From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@student.ethz.ch>, Jeff King <peff@peff.net>
Subject: Re: [PATCH v2] tests: add initial bash completion tests
Date: Fri, 13 Apr 2012 11:12:36 +0200 [thread overview]
Message-ID: <20120413091236.GC2164@goldbirke> (raw)
In-Reply-To: <1334181423-4391-1-git-send-email-felipe.contreras@gmail.com>
Hi,
On Thu, Apr 12, 2012 at 12:57:03AM +0300, Felipe Contreras wrote:
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>
> Since v1:
>
> * Check if we are running bash in posix mode
> * Don't check for all git porcelain commands
>
> t/t9902-completion.sh | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 115 insertions(+)
> create mode 100755 t/t9902-completion.sh
>
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> new file mode 100755
> index 0000000..cbda6b5
> --- /dev/null
> +++ b/t/t9902-completion.sh
> @@ -0,0 +1,115 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2012 Felipe Contreras
> +#
> +
> +if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then
> + # we are in full-on bash mode
> + true
> +elif type bash >/dev/null 2>&1; then
> + # execute in full-on bash mode
> + unset POSIXLY_CORRECT
> + exec bash "$0" "$@"
> +else
> + echo '1..0 #SKIP skipping bash completion tests; bash not available'
> + exit 0
> +fi
> +
> +test_description='test bash completion'
> +
> +. ./test-lib.sh
> +
> +complete ()
> +{
> + # do nothing
> + return 0
> +}
> +
> +. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
> +
> +_get_comp_words_by_ref ()
> +{
> + while [ $# -gt 0 ]; do
> + case "$1" in
> + cur)
> + cur=${_words[_cword]}
> + ;;
> + prev)
> + prev=${_words[_cword-1]}
> + ;;
> + words)
> + words=("${_words[@]}")
> + ;;
> + cword)
> + cword=$_cword
> + ;;
> + esac
> + shift
> + done
> +}
Git's completion script already implements this function. Why
override it here?
> +print_comp ()
> +{
> + local IFS=$'\n'
> + echo "${COMPREPLY[*]}" > out
> +}
> +
> +run_completion ()
> +{
> + local -a COMPREPLY _words
> + local _cword
> + _words=( $1 )
> + (( _cword = ${#_words[@]} - 1 ))
> + _git && print_comp
> +}
> +
> +test_completion ()
> +{
> + test $# -gt 1 && echo "$2" > expected
> + run_completion "$@" &&
> + test_cmp expected out
> +}
> +
> +test_expect_success 'basic' '
> + run_completion "git \"\"" &&
> + # built-in
> + grep -q "^add \$" out &&
> + # script
> + grep -q "^filter-branch \$" out &&
> + # plumbing
> + ! grep -q "^ls-files \$" out
The && is missing here at the end of the line.
> + run_completion "git f" &&
> + ! grep -q -v "^f" out
grep is not a git command, so I'm not sure, but shouldn't these use
'test_must_fail grep' instead of '! grep'?
Anyway, thanks for pushing this forward. I have a bunch of tests for
my __git_ps1() optimizations, but, being a bash function, I could
never figure out how to integrate it with the test framework.
Best,
Gábor
next prev parent reply other threads:[~2012-04-13 9:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 21:57 [PATCH v2] tests: add initial bash completion tests Felipe Contreras
2012-04-11 23:48 ` Junio C Hamano
2012-04-12 16:15 ` Felipe Contreras
2012-04-12 17:43 ` Junio C Hamano
2012-04-12 23:18 ` Felipe Contreras
2012-04-12 23:26 ` Junio C Hamano
2012-04-13 19:45 ` Junio C Hamano
2012-04-13 9:12 ` SZEDER Gábor [this message]
2012-04-13 9:45 ` SZEDER Gábor
2012-04-13 10:48 ` Felipe Contreras
2012-04-13 11:14 ` SZEDER Gábor
2012-04-13 11:56 ` Felipe Contreras
2012-04-13 10:34 ` Felipe Contreras
2012-04-13 10:52 ` SZEDER Gábor
2012-04-13 11:33 ` Thomas Rast
2012-04-13 19:48 ` Junio C Hamano
2012-04-14 2:06 ` Felipe Contreras
2012-04-17 0:31 ` SZEDER Gábor
2012-04-17 6:32 ` Felipe Contreras
2012-04-17 10:22 ` SZEDER Gábor
2012-04-17 10:27 ` [PATCH] tests: add tests for the __gitcomp() completion helper function SZEDER Gábor
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=20120413091236.GC2164@goldbirke \
--to=szeder@ira.uka.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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