[PATCH 5/9] test: fix "skipping test" verbose output
Dmitry Kurochkin
dmitry.kurochkin at gmail.com
Wed Nov 16 17:56:22 PST 2011
---
test/test-lib.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/test/test-lib.sh b/test/test-lib.sh
index ab8c6fd..acac8ca 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -635,41 +635,42 @@ test_skip () {
test_report_skip_ "$@"
;;
*)
test_check_missing_external_prereqs_ "$@"
;;
esac
}
test_check_missing_external_prereqs_ () {
if test -n "$test_subtest_missing_external_prereqs_"; then
say_color skip >&3 "missing prerequisites:"
echo "$test_subtest_missing_external_prereqs_" >&3
test_report_skip_ "$@"
else
false
fi
}
test_report_skip_ () {
test_reset_state_
- say_color skip >&3 "skipping test: $@"
+ say_color skip >&3 "skipping test:"
+ echo " $@" >&3
say_color skip "%-6s" "SKIP"
echo " $1"
}
test_subtest_known_broken () {
test_subtest_known_broken_=t
}
test_expect_success () {
test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-success"
test_reset_state_
if ! test_skip "$@"
then
test_run_ "$2"
run_ret="$?"
# test_run_ may update missing external prerequisites
test_check_missing_external_prereqs_ "$@" ||
if [ "$run_ret" = 0 -a "$eval_ret" = 0 ]
--
1.7.7.2
More information about the notmuch
mailing list