summaryrefslogtreecommitdiffstats
path: root/tests/functions.sh
diff options
context:
space:
mode:
authorKarel Zak2009-01-20 23:42:33 +0100
committerKarel Zak2009-02-11 23:35:22 +0100
commit425ca40aa29190d0bfe4e6def13568740913b423 (patch)
tree38f983dc8adea8660cedd793174063210fda8f93 /tests/functions.sh
parenttests: add support for subtests (diff)
downloadkernel-qcow2-util-linux-425ca40aa29190d0bfe4e6def13568740913b423.tar.gz
kernel-qcow2-util-linux-425ca40aa29190d0bfe4e6def13568740913b423.tar.xz
kernel-qcow2-util-linux-425ca40aa29190d0bfe4e6def13568740913b423.zip
tests: fix the final message for subtests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/functions.sh')
-rw-r--r--tests/functions.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/functions.sh b/tests/functions.sh
index 935016c99..581059d91 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -218,14 +218,6 @@ function ts_finalize {
chown ${TS_SUID_USER[$idx]}.${TS_SUID_GROUP[$idx]} $PROG &> /dev/null
done
- if [ -s $TS_EXPECTED ]; then
- ts_gen_diff
- if [ $? -eq 1 ]; then
- ts_failed "$1"
- fi
- ts_ok "$1"
- fi
-
if [ $TS_NSUBTESTS -ne 0 ]; then
printf "%13s..."
if [ $TS_NSUBFAILED -ne 0 ]; then
@@ -234,6 +226,15 @@ function ts_finalize {
ts_ok "all $TS_NSUBTESTS sub-tests PASSED"
fi
fi
+
+ if [ -s $TS_EXPECTED ]; then
+ ts_gen_diff
+ if [ $? -eq 1 ]; then
+ ts_failed "$1"
+ fi
+ ts_ok "$1"
+ fi
+
ts_skip "output undefined"
}