Permalink
Browse files

test-lib: Simplify test counting.

Since the test case counter was incremented very late, there were a few
users of the counter had to do their own incrementing. Now we increment it
early and simplify these users.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
  • Loading branch information...
1 parent d5d9de1 commit 8586f98bd29bd4ad3d0e62a3be4a4d59ff8b27cd @j6t j6t committed Feb 5, 2009
Showing with 5 additions and 11 deletions.
  1. +1 −2 t/t4013-diff-various.sh
  2. +1 −2 t/t5515-fetch-merge-logic.sh
  3. +3 −7 t/test-lib.sh
@@ -101,8 +101,7 @@ do
'' | '#'*) continue ;;
esac
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
- cnt=`expr $test_count + 1`
- pfx=`printf "%04d" $cnt`
+ pfx=`printf "%04d" $test_count`
expect="$TEST_DIRECTORY/t4013/diff.$test"
actual="$pfx-diff.$test"
@@ -129,8 +129,7 @@ do
'' | '#'*) continue ;;
esac
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
- cnt=`expr $test_count + 1`
- pfx=`printf "%04d" $cnt`
+ pfx=`printf "%04d" $test_count`
expect_f="$TEST_DIRECTORY/t5515/fetch.$test"
actual_f="$pfx-fetch.$test"
expect_r="$TEST_DIRECTORY/t5515/refs.$test"
View
@@ -242,13 +242,11 @@ test_merge () {
# the text_expect_* functions instead.
test_ok_ () {
- test_count=$(($test_count + 1))
test_success=$(($test_success + 1))
say_color "" " ok $test_count: $@"
}
test_failure_ () {
- test_count=$(($test_count + 1))
test_failure=$(($test_failure + 1))
say_color error "FAIL $test_count: $1"
shift
@@ -257,13 +255,11 @@ test_failure_ () {
}
test_known_broken_ok_ () {
- test_count=$(($test_count+1))
test_fixed=$(($test_fixed+1))
say_color "" " FIXED $test_count: $@"
}
test_known_broken_failure_ () {
- test_count=$(($test_count+1))
test_broken=$(($test_broken+1))
say_color skip " still broken $test_count: $@"
}
@@ -279,18 +275,18 @@ test_run_ () {
}
test_skip () {
+ test_count=$(($test_count+1))
to_skip=
for skp in $GIT_SKIP_TESTS
do
- case $this_test.$(($test_count+1)) in
+ case $this_test.$test_count in
$skp)
to_skip=t
esac
done
case "$to_skip" in
t)
say_color skip >&3 "skipping test: $@"
- test_count=$(($test_count+1))
say_color skip "skip $test_count: $1"
: true
;;
@@ -368,7 +364,7 @@ test_external () {
then
# Announce the script to reduce confusion about the
# test output that follows.
- say_color "" " run $(($test_count+1)): $descr ($*)"
+ say_color "" " run $test_count: $descr ($*)"
# Run command; redirect its stderr to &4 as in
# test_run_, but keep its stdout on our stdout even in
# non-verbose mode.

0 comments on commit 8586f98

Please sign in to comment.