Diffstat (limited to 'tests/setup.sh')
| -rwxr-xr-x | tests/setup.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 66bf406..51d5a75 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -54,9 +54,7 @@ summary-tags=5 repo.url=foo repo.path=$PWD/trash/repos/foo/.git -# 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.desc=the foo repo repo.url=bar repo.path=$PWD/trash/repos/bar/.git @@ -67,10 +65,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 +75,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,17 +85,14 @@ 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" + printf " %s: ok - %s\n" $test_count "$desc" else ((test_failed++)) - printf " %2d) %-60s [failed]\n" $test_count "$desc" + printf " %s: fail - %s\n" $test_count "$desc" fi } |