Skip to content

Commit

Permalink
test-lib.sh: move error line after error() declaration
Browse files Browse the repository at this point in the history
This 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michele Ballabio authored and Junio C Hamano committed Nov 10, 2007
1 parent c899a57 commit 570f322
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 570f322

Please sign in to comment.