author | Lars Hjemli <hjemli@gmail.com> | 2008-02-24 15:05:58 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-24 15:05:58 (UTC) |
commit | b44b02a98253e78334f7fd13d9c4e1eb59562392 (patch) (unidiff) | |
tree | 25ecb51d60eba75ea473eeaa32f08b9e548aedde /tests | |
parent | e5ca46bf4b974ce3b51d09da4c7ad741aaa70ede (diff) | |
download | cgit-b44b02a98253e78334f7fd13d9c4e1eb59562392.zip cgit-b44b02a98253e78334f7fd13d9c4e1eb59562392.tar.gz cgit-b44b02a98253e78334f7fd13d9c4e1eb59562392.tar.bz2 |
Make output from `make test` more readable
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 9bb1f12..5f20286 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -46,65 +46,65 @@ cache-root=$PWD/trash/cache | |||
46 | 46 | ||
47 | nocache=0 | 47 | nocache=0 |
48 | snapshots=tar.gz tar.bz zip | 48 | snapshots=tar.gz tar.bz zip |
49 | enable-log-filecount=1 | 49 | enable-log-filecount=1 |
50 | enable-log-linecount=1 | 50 | enable-log-linecount=1 |
51 | summary-log=5 | 51 | summary-log=5 |
52 | summary-branches=5 | 52 | summary-branches=5 |
53 | summary-tags=5 | 53 | summary-tags=5 |
54 | 54 | ||
55 | repo.url=foo | 55 | repo.url=foo |
56 | repo.path=$PWD/trash/repos/foo/.git | 56 | repo.path=$PWD/trash/repos/foo/.git |
57 | # Do not specify a description for this repo, as it then will be assigned | 57 | # Do not specify a description for this repo, as it then will be assigned |
58 | # the constant value "[no description]" (which actually used to cause a | 58 | # the constant value "[no description]" (which actually used to cause a |
59 | # segfault). | 59 | # segfault). |
60 | 60 | ||
61 | repo.url=bar | 61 | repo.url=bar |
62 | repo.path=$PWD/trash/repos/bar/.git | 62 | repo.path=$PWD/trash/repos/bar/.git |
63 | repo.desc=the bar repo | 63 | repo.desc=the bar repo |
64 | EOF | 64 | EOF |
65 | } | 65 | } |
66 | 66 | ||
67 | prepare_tests() | 67 | prepare_tests() |
68 | { | 68 | { |
69 | setup_repos | 69 | setup_repos |
70 | test_count=0 | 70 | test_count=0 |
71 | test_failed=0 | 71 | test_failed=0 |
72 | echo "$@" "($0)" | 72 | echo "$@" "($0)" |
73 | } | 73 | } |
74 | 74 | ||
75 | tests_done() | 75 | tests_done() |
76 | { | 76 | { |
77 | printf "\n" | 77 | printf "\n" |
78 | if test $test_failed -gt 0 | 78 | if test $test_failed -gt 0 |
79 | then | 79 | then |
80 | printf "[%s of %s tests failed]\n" $test_failed $test_count | 80 | printf "[%s of %s tests failed]\n" $test_failed $test_count |
81 | false | 81 | false |
82 | fi | 82 | fi |
83 | } | 83 | } |
84 | 84 | ||
85 | run_test() | 85 | run_test() |
86 | { | 86 | { |
87 | desc=$1 | 87 | desc=$1 |
88 | script=$2 | 88 | script=$2 |
89 | ((test_count++)) | 89 | ((test_count++)) |
90 | eval "$2" >test-output.log | 90 | eval "$2" >test-output.log |
91 | res=$? | 91 | res=$? |
92 | if test $res = 0 | 92 | if test $res = 0 |
93 | then | 93 | then |
94 | printf " %s: ok - %s\n" $test_count "$desc" | 94 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
95 | else | 95 | else |
96 | ((test_failed++)) | 96 | ((test_failed++)) |
97 | printf " %s: fail - %s\n" $test_count "$desc" | 97 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
98 | fi | 98 | fi |
99 | } | 99 | } |
100 | 100 | ||
101 | cgit_query() | 101 | cgit_query() |
102 | { | 102 | { |
103 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | 103 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" |
104 | } | 104 | } |
105 | 105 | ||
106 | cgit_url() | 106 | cgit_url() |
107 | { | 107 | { |
108 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 108 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
109 | } | 109 | } |
110 | 110 | ||