Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
---
Maybe this is just me, but I don't find the output of the test-suite
easy to watch while scrolling. This puts some colors in proper places.
* end-test summaries are in green or red depending on the sucess of
the tests.
* errors are in red.
* skipped tests and other things that tests `say` are in brown (now
you can _see_ that your testsuite skips some tests on purpose, I
only noticed recently that I missed part of the environment for
proper testing).
I'm not 100% sure the test to see if terminal supports color is correct, and
people using emacs shell buffer or alike tools may have better ideas on how to
make it.
and yes, I know that it "depends" upon tput, but if tput isn't available, the
[ "x$TERM" != "xdumb" ] && tput hpa 60 >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1
expression will fail, and color will be disabled.
t/test-lib.sh | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index cc1253c..c6521c0 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -59,14 +59,24 @@ esac
# '
# . ./test-lib.sh
+[ "x$TERM" != "xdumb" ] && tput hpa 60 >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1
+nocolor=$?
+
+say_color () {
+ [ "$nocolor" = 0 ] && [ "$1" != '-1' ] && tput setaf "$1"
+ shift
+ echo "* $*"
+ tput op
+}
+
error () {
- echo "* error: $*"
+ say_color 9 "* error: $*"
trap - exit
exit 1
}
say () {
- echo "* $*"
+ say_color 3 "$*"
}
test "${test_description}" != "" ||
@@ -84,6 +94,8 @@ do
exit 0 ;;
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
verbose=t; shift ;;
+ --no-color)
+ nocolor=1; shift ;;
--no-python)
# noop now...
shift ;;
@@ -122,13 +134,13 @@ test_tick () {
test_ok_ () {
test_count=$(expr "$test_count" + 1)
- say " ok $test_count: $@"
+ say_color -1 " ok $test_count: $@"
}
test_failure_ () {
test_count=$(expr "$test_count" + 1)
test_failure=$(expr "$test_failure" + 1);
- say "FAIL $test_count: $1"
+ say_color 9 "FAIL $test_count: $1"
shift
echo "$@" | sed -e 's/^/ /'
test "$immediate" = "" || { trap - exit; exit 1; }
@@ -158,9 +170,9 @@ test_skip () {
done
case "$to_skip" in
t)
- say >&3 "skipping test: $@"
+ say_color 10 >&3 "skipping test: $@"
test_count=$(expr "$test_count" + 1)
- say "skip $test_count: $1"
+ say_color 10 "skip $test_count: $1"
: true
;;
*)
@@ -247,11 +259,11 @@ test_done () {
# The Makefile provided will clean this test area so
# we will leave things as they are.
- say "passed all $test_count test(s)"
+ say_color 2 "passed all $test_count test(s)"
exit 0 ;;
*)
- say "failed $test_failure among $test_count test(s)"
+ say_color 9 "failed $test_failure among $test_count test(s)"
exit 1 ;;
esac
@@ -296,8 +308,8 @@ do
done
case "$to_skip" in
t)
- say >&3 "skipping test $this_test altogether"
- say "skip all tests in $this_test"
+ say_color 10 >&3 "skipping test $this_test altogether"
+ say_color 10 "skip all tests in $this_test"
test_done
esac
done
--
1.5.3.4.1342.ge0cd-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
