From: Lars Schneider <larsxschnei...@gmail.com>
Add an (optional) first parameter "ok=<special case>" to test_must_fail
and return success for "<special case>". Add "success" as
"<special case>" and use it to implement "test_might_fail". This removes
redundancies in test-lib-function.sh.
Signed-off-by: Junio C Hamano <gits...@pobox.com>
Signed-off-by: Lars Schneider <larsxschnei...@gmail.com>
---
t/test-lib-functions.sh | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 73e37a1..1e762da 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -582,18 +582,32 @@ test_line_count () {
# the failure could be due to a segv. We want a controlled failure.
test_must_fail () {
+ case "$1" in
+ ok=*)
+ _test_ok=${1#ok=}
+ shift
+ ;;
+ *)
+ _test_ok=
+ ;;
+ esac
"$@"
exit_code=$?
- if test $exit_code = 0; then
+ if ! case ",$_test_ok," in *,success,*) false;; esac &&
+ test $exit_code = 0
+ then
echo >&2 "test_must_fail: command succeeded: $*"
- return 1
- elif test $exit_code -gt 129 && test $exit_code -le 192; then
+ return 0
+ elif test $exit_code -gt 129 && test $exit_code -le 192
+ then
echo >&2 "test_must_fail: died by signal: $*"
return 1
- elif test $exit_code = 127; then
+ elif test $exit_code = 127
+ then
echo >&2 "test_must_fail: command not found: $*"
return 1
- elif test $exit_code = 126; then
+ elif test $exit_code = 126
+ then
echo >&2 "test_must_fail: valgrind error: $*"
return 1
fi
@@ -612,16 +626,7 @@ test_must_fail () {
# because we want to notice if it fails due to segv.
test_might_fail () {
- "$@"
- exit_code=$?
- if test $exit_code -gt 129 && test $exit_code -le 192; then
- echo >&2 "test_might_fail: died by signal: $*"
- return 1
- elif test $exit_code = 127; then
- echo >&2 "test_might_fail: command not found: $*"
- return 1
- fi
- return 0
+ test_must_fail ok=success "$@"
}
# Similar to test_must_fail and test_might_fail, but check that a
--
2.5.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
