diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2012-05-09 02:44:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-09 14:27:08 -0700 |
| commit | f8891cfa2a16d040d799f281684851fa7b2a0c2b (patch) | |
| tree | 07a2f343d075453e1b374834740e2b12b09d69fa | |
| parent | a3935e6791c619a9f2f472e9e553d45d88c4e263 (diff) | |
| download | git-f8891cfa2a16d040d799f281684851fa7b2a0c2b.tar.gz | |
tests: move code to run tests under bash into a helper library
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-bash.sh | 18 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 14 |
2 files changed, 19 insertions, 13 deletions
diff --git a/t/lib-bash.sh b/t/lib-bash.sh new file mode 100644 index 0000000000..11397f747b --- /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 5bda6b6e18..a0ea946327 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 () { |