Michele BallabioThis patch removes a spurious "command not found" error and actually makes the "Test script did not set test_description." string follow the command line option "--no-color".
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> ---
This is for the master branch.
t/test-lib.sh | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
Show changes to t/test-lib.sh +10 −5
diff --git a/t/test-lib.sh b/t/test-lib.sh index 603a8cd..90b6844 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -66,9 +66,6 @@ esac tput sgr0 >/dev/null 2>&1 && color=t -test "${test_description}" != "" || -error "Test script did not set test_description." - while test "$#" -ne 0 do case "$1" in @@ -77,8 +74,7 @@ do -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate) immediate=t; shift ;; -h|--h|--he|--hel|--help) - echo "$test_description" - exit 0 ;; + help=t; shift ;; -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) verbose=t; shift ;; -q|--q|--qu|--qui|--quie|--quiet) @@ -124,6 +120,15 @@ say () { say_color info "$*" } +test "${test_description}" != "" || +error "Test script did not set test_description." + +if test "$help" = "t" +then + echo "$test_description" + exit 0 +fi + exec 5>&1 if test "$verbose" = "t" then
-- 1.5.3.5