[PATCH 01/19] tests: move code to run tests under bash into a helper library
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- May 9, 2012, 00:44 UTC
- Message-ID
- <1336524290-30023-2-git-send-email-szeder@ira.uka.de>
- In-Reply-To
- <1336524290-30023-1-git-send-email-szeder@ira.uka.de>
The following patch will add tests for the bash prompt functions as a new test script, which also has to be run under bash.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> --- t/lib-bash.sh | 18 ++++++++++++++++++ t/t9902-completion.sh | 14 +------------- 2 files changed, 19 insertions(+), 13 deletions(-) create mode 100755 t/lib-bash.sh
diff --git a/t/lib-bash.sh b/t/lib-bash.sh new file mode 100644 index 00000000..11397f74 --- /dev/null +++ b/t/lib-bash.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Ensures that tests are run under Bash; primarily intended for running tests +# of the completion script. + +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-lib.sh diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 5bda6b6e..a0ea9463 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -3,21 +3,9 @@ # 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 +. ./lib-bash.sh complete () {
-- 1.7.10.1.541.gb1be298