Merge branch 'lh/cache'

[ps-cgit] / tests / setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 51d5a7519af685cd8a9927dce86bde737f63db24..e37306eee7d9afb41b8ce456fab5e83bd9214489 100755 (executable)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -44,7 +44,7 @@ setup_repos()
 virtual-root=/
 cache-root=$PWD/trash/cache
 
-nocache=0
+cache-size=1021
 snapshots=tar.gz tar.bz zip
 enable-log-filecount=1
 enable-log-linecount=1
@@ -54,7 +54,9 @@ summary-tags=5
 
 repo.url=foo
 repo.path=$PWD/trash/repos/foo/.git
-repo.desc=the foo repo
+# Do not specify a description for this repo, as it then will be assigned
+# the constant value "[no description]" (which actually used to cause a
+# segfault).
 
 repo.url=bar
 repo.path=$PWD/trash/repos/bar/.git
@@ -65,8 +67,10 @@ 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)"
 }
 
@@ -75,7 +79,8 @@ tests_done()
        printf "\n"
        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
 }
@@ -85,14 +90,17 @@ run_test()
        desc=$1
        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
-               printf "  %s: ok - %s\n" $test_count "$desc"
+               printf " %2d) %-60s [ok]\n" $test_count "$desc"
        else
                ((test_failed++))
-               printf "  %s: fail - %s\n" $test_count "$desc"
+               printf " %2d) %-60s [failed]\n" $test_count "$desc"
        fi
 }