diff options
Diffstat (limited to 'testsuite/runtest')
-rwxr-xr-x | testsuite/runtest | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/testsuite/runtest b/testsuite/runtest index c300233cd..9a4fccbbf 100755 --- a/testsuite/runtest +++ b/testsuite/runtest | |||
@@ -4,6 +4,8 @@ | |||
4 | 4 | ||
5 | . ./testing.sh | 5 | . ./testing.sh |
6 | 6 | ||
7 | total_failed=0 | ||
8 | |||
7 | # Run one old-style test. | 9 | # Run one old-style test. |
8 | # Tests are stored in applet/testcase shell scripts. | 10 | # Tests are stored in applet/testcase shell scripts. |
9 | # They are run using "sh -x -e applet/testcase". | 11 | # They are run using "sh -x -e applet/testcase". |
@@ -73,6 +75,7 @@ run_oldstyle_applet_tests() | |||
73 | *.r[0-9]*) continue ;; # svn-produced junk | 75 | *.r[0-9]*) continue ;; # svn-produced junk |
74 | esac | 76 | esac |
75 | run_applet_testcase "$applet" "$testcase" || status=1 | 77 | run_applet_testcase "$applet" "$testcase" || status=1 |
78 | total_failed=$((total_failed + status)) | ||
76 | done | 79 | done |
77 | return $status | 80 | return $status |
78 | } | 81 | } |
@@ -150,7 +153,10 @@ for applet in $applets; do | |||
150 | fi | 153 | fi |
151 | # echo "Running test $tsdir/$applet.tests" | 154 | # echo "Running test $tsdir/$applet.tests" |
152 | PATH="$LINKSDIR:$tsdir:$bindir:$PATH" \ | 155 | PATH="$LINKSDIR:$tsdir:$bindir:$PATH" \ |
153 | "$tsdir/$applet.tests" || status=1 | 156 | "$tsdir/$applet.tests" |
157 | rc=$? | ||
158 | total_failed=$((total_failed + rc)) | ||
159 | test $rc -ne 0 && status=1 | ||
154 | fi | 160 | fi |
155 | done | 161 | done |
156 | 162 | ||
@@ -158,6 +164,6 @@ done | |||
158 | #rm -rf "$LINKSDIR" | 164 | #rm -rf "$LINKSDIR" |
159 | 165 | ||
160 | if [ $status -ne 0 ] && [ x"$VERBOSE" = x ]; then | 166 | if [ $status -ne 0 ] && [ x"$VERBOSE" = x ]; then |
161 | echo "Failures detected, running with -v (verbose) will give more info" | 167 | echo "$total_failed failure(s) detected; running with -v (verbose) will give more info" |
162 | fi | 168 | fi |
163 | exit $status | 169 | exit $status |