1 files changed, 8 insertions, 2 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index 5f20286..66bf406 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -68,6 +68,8 @@ 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)"
 }
@@ -78,5 +80,6 @@ tests_done()
         if test $test_failed -gt 0
         then
-                printf "[%s of %s tests failed]\n" $test_failed $test_count
+                printf "test: *** %s failure(s), logfile=%s\n" \
+                        $test_failed "$(pwd)/test-output.log"
                 false
         fi
@@ -88,6 +91,9 @@ run_test()
         script=$2
         ((test_count++))
-        eval "$2" >test-output.log
+        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
         res=$?
+        printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
         if test $res = 0
         then