-rwxr-xr-x | tests/setup.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 51d5a75..66bf406 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -55,5 +55,7 @@ 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 @@ -66,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)" } @@ -76,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 @@ -86,12 +91,15 @@ 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 - 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 } |