projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run the tutorial through ispell once more
[git.git]
/
t
/
test-lib.sh
diff --git
a/t/test-lib.sh
b/t/test-lib.sh
index
079e5bd
..
d3f71d1
100755
(executable)
--- a/
t/test-lib.sh
+++ b/
t/test-lib.sh
@@
-50,6
+50,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 ;;
@@
-70,19
+72,25
@@
fi
test_failure=0
test_count=0
test_failure=0
test_count=0
-test_debug () {
- test "$debug" == "" || eval "$1"
-}
-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)
test_count=$(expr "$test_count" + 1)
- say "
ok #
$test_count: $@"
+ 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 "NO #$test_count: $@"
+ say "FAIL $test_count: $@"
+ test "$immediate" == "" || exit 1
+}
+
+
+test_debug () {
+ test "$debug" == "" || eval "$1"
}
test_expect_failure () {
}
test_expect_failure () {
@@
-91,9
+99,9
@@
test_expect_failure () {
say >&3 "expecting failure: $2"
if eval >&3 2>&4 "$2"
then
say >&3 "expecting failure: $2"
if eval >&3 2>&4 "$2"
then
- test_failure "$@"
+ test_failure
_
"$@"
else
else
- test_ok "$1"
+ test_ok
_
"$1"
fi
}
fi
}
@@
-103,9
+111,9
@@
test_expect_success () {
say >&3 "expecting success: $2"
if eval >&3 2>&4 "$2"
then
say >&3 "expecting success: $2"
if eval >&3 2>&4 "$2"
then
- test_ok "$1"
+ test_ok
_
"$1"
else
else
- test_failure "$@"
+ test_failure
_
"$@"
fi
}
fi
}