From 425ca40aa29190d0bfe4e6def13568740913b423 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 20 Jan 2009 23:42:33 +0100 Subject: tests: fix the final message for subtests Signed-off-by: Karel Zak --- tests/functions.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests/functions.sh') 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" } -- cgit v1.2.3-55-g7522