-rwxr-xr-x | tests/setup.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 30f90d5..9f66d89 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -88,42 +88,54 @@ prepare_tests() | |||
88 | echo "$@" "($0)" | 88 | echo "$@" "($0)" |
89 | } | 89 | } |
90 | 90 | ||
91 | tests_done() | 91 | tests_done() |
92 | { | 92 | { |
93 | printf "\n" | 93 | printf "\n" |
94 | if test $test_failed -gt 0 | 94 | if test $test_failed -gt 0 |
95 | then | 95 | then |
96 | printf "test: *** %s failure(s), logfile=%s\n" \ | 96 | printf "test: *** %s failure(s), logfile=%s\n" \ |
97 | $test_failed "$(pwd)/test-output.log" | 97 | $test_failed "$(pwd)/test-output.log" |
98 | false | 98 | false |
99 | fi | 99 | fi |
100 | } | 100 | } |
101 | 101 | ||
102 | run_test() | 102 | run_test() |
103 | { | 103 | { |
104 | bug=0 | ||
105 | if test "$1" = "BUG" | ||
106 | then | ||
107 | bug=1 | ||
108 | shift | ||
109 | fi | ||
104 | desc=$1 | 110 | desc=$1 |
105 | script=$2 | 111 | script=$2 |
106 | test_count=$(expr $test_count + 1) | 112 | test_count=$(expr $test_count + 1) |
107 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log | 113 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log |
108 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log | 114 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log |
109 | eval "$2" >>test-output.log 2>>test-output.log | 115 | eval "$2" >>test-output.log 2>>test-output.log |
110 | res=$? | 116 | res=$? |
111 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log | 117 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log |
112 | if test $res = 0 | 118 | if test $res = 0 -a $bug = 0 |
113 | then | 119 | then |
114 | printf " %2d) %-60s [ok]\n" $test_count "$desc" | 120 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
121 | elif test $res = 0 -a $bug = 1 | ||
122 | then | ||
123 | printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc" | ||
124 | elif test $bug = 1 | ||
125 | then | ||
126 | printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc" | ||
115 | else | 127 | else |
116 | test_failed=$(expr $test_failed + 1) | 128 | test_failed=$(expr $test_failed + 1) |
117 | printf " %2d) %-60s [failed]\n" $test_count "$desc" | 129 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
118 | fi | 130 | fi |
119 | } | 131 | } |
120 | 132 | ||
121 | cgit_query() | 133 | cgit_query() |
122 | { | 134 | { |
123 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | 135 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" |
124 | } | 136 | } |
125 | 137 | ||
126 | cgit_url() | 138 | cgit_url() |
127 | { | 139 | { |
128 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 140 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
129 | } | 141 | } |