projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show-branch: --list and --independent
[git.git]
/
t
/
test-lib.sh
diff --git
a/t/test-lib.sh
b/t/test-lib.sh
index
9b88cc4
..
1523d2e
100755
(executable)
--- a/
t/test-lib.sh
+++ b/
t/test-lib.sh
@@
-5,8
+5,9
@@
# For repeatability, reset the environment to known value.
LANG=C
# For repeatability, reset the environment to known value.
LANG=C
+PAGER=cat
TZ=UTC
TZ=UTC
-export LANG TZ
+export LANG
PAGER
TZ
unset AUTHOR_DATE
unset AUTHOR_EMAIL
unset AUTHOR_NAME
unset AUTHOR_DATE
unset AUTHOR_EMAIL
unset AUTHOR_NAME
@@
-35,6
+36,7
@@
unset SHA1_FILE_DIRECTORY
error () {
echo "* error: $*"
error () {
echo "* error: $*"
+ trap - exit
exit 1
}
exit 1
}
@@
-50,6
+52,8
@@
do
case "$1" in
-d|--d|--de|--deb|--debu|--debug)
debug=t; shift ;;
case "$1" in
-d|--d|--de|--deb|--debu|--debug)
debug=t; shift ;;
+ -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate)
+ immediate=t; shift ;;
-h|--h|--he|--hel|--help)
echo "$test_description"
exit 0 ;;
-h|--h|--he|--hel|--help)
echo "$test_description"
exit 0 ;;
@@
-60,6
+64,7
@@
do
esac
done
esac
done
+exec 5>&1
if test "$verbose" = "t"
then
exec 4>&2 3>&1
if test "$verbose" = "t"
then
exec 4>&2 3>&1
@@
-70,46
+75,65
@@
fi
test_failure=0
test_count=0
test_failure=0
test_count=0
-test_debug () {
- test "$debug" == "" || eval "$1"
-}
+trap 'echo >&5 "FATAL: Unexpected exit with code $?"; exit 1' exit
+
-test_ok () {
+# You are not expected to call test_ok_ and test_failure_ directly, use
+# the text_expect_* functions instead.
+
+test_ok_ () {
test_count=$(expr "$test_count" + 1)
say " ok $test_count: $@"
}
test_count=$(expr "$test_count" + 1)
say " ok $test_count: $@"
}
-test_failure () {
+test_failure
_
() {
test_count=$(expr "$test_count" + 1)
test_failure=$(expr "$test_failure" + 1);
test_count=$(expr "$test_count" + 1)
test_failure=$(expr "$test_failure" + 1);
- say "FAIL $test_count: $@"
+ say "FAIL $test_count: $1"
+ shift
+ echo "$@" | sed -e 's/^/ /'
+ test "$immediate" = "" || { trap - exit; exit 1; }
+}
+
+
+test_debug () {
+ test "$debug" = "" || eval "$1"
+}
+
+test_run_ () {
+ eval >&3 2>&4 "$1"
+ eval_ret="$?"
+ return 0
}
test_expect_failure () {
}
test_expect_failure () {
- test "$#" =
=
2 ||
+ test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-failure"
say >&3 "expecting failure: $2"
error "bug in the test script: not 2 parameters to test-expect-failure"
say >&3 "expecting failure: $2"
- if eval >&3 2>&4 "$2"
+ test_run_ "$2"
+ if [ "$?" = 0 -a "$eval_ret" != 0 ]
then
then
- test_
failure "$@
"
+ test_
ok_ "$1
"
else
else
- test_
ok "$1
"
+ test_
failure_ "$@
"
fi
}
test_expect_success () {
fi
}
test_expect_success () {
- test "$#" =
=
2 ||
+ test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-success"
say >&3 "expecting success: $2"
error "bug in the test script: not 2 parameters to test-expect-success"
say >&3 "expecting success: $2"
- if eval >&3 2>&4 "$2"
+ test_run_ "$2"
+ if [ "$?" = 0 -a "$eval_ret" = 0 ]
then
then
- test_ok "$1"
+ test_ok
_
"$1"
else
else
- test_failure "$@"
+ test_failure
_
"$@"
fi
}
test_done () {
fi
}
test_done () {
+ trap - exit
case "$test_failure" in
0)
# We could:
case "$test_failure" in
0)
# We could: