aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
-rwxr-xr-xtests/setup.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index 66bf406..5f20286 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -67,10 +67,8 @@ EOF
prepare_tests()
{
setup_repos
- rm -f test-output.log 2>/dev/null
test_count=0
test_failed=0
- echo "[$0]" "$@" >test-output.log
echo "$@" "($0)"
}
@@ -79,8 +77,7 @@ tests_done()
printf "\n"
if test $test_failed -gt 0
then
- printf "test: *** %s failure(s), logfile=%s\n" \
- $test_failed "$(pwd)/test-output.log"
+ printf "[%s of %s tests failed]\n" $test_failed $test_count
false
fi
}
@@ -90,11 +87,8 @@ run_test()
desc=$1
script=$2
((test_count++))
- printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
- printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
- eval "$2" >>test-output.log 2>>test-output.log
+ eval "$2" >test-output.log
res=$?
- printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
if test $res = 0
then
printf " %2d) %-60s [ok]\n" $test_count "$desc"