From: David Dillow <dave@thedillows.org>
Date: Sat, 6 Jun 2009 04:05:33 +0000 (-0400)
Subject: Have the test framework always run the cleanup script
X-Git-Tag: 0.1~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=261d02965986566d9455f0374136f28213657855;p=thirdparty%2Fdracut.git

Have the test framework always run the cleanup script

Also remove some extra semicolons, and put the pointer to the test log
on its own line.
---

diff --git a/test/test-functions b/test/test-functions
index 7b219ba49..cf0768b89 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1,27 +1,33 @@
 while (($# > 0)); do
     case $1 in
         --run) 
-	    echo "TEST RUN: $TEST_DESCRIPTION";
-	    test_run;
+	    echo "TEST RUN: $TEST_DESCRIPTION"
+	    test_run
 	    exit $?;;
         --setup) 
-	    echo "TEST SETUP: $TEST_DESCRIPTION";
-	    test_setup;
+	    echo "TEST SETUP: $TEST_DESCRIPTION"
+	    test_setup
 	    exit $?;;
         --clean) 
-	    echo "TEST CLEANUP: $TEST_DESCRIPTION";
-	    test_cleanup;
+	    echo "TEST CLEANUP: $TEST_DESCRIPTION"
+	    test_cleanup
 	    exit $?;;
         --all) 
 	    echo -n "TEST: $TEST_DESCRIPTION ";
-	    { test_setup && test_run && test_cleanup; } </dev/null >test.log 2>&1;
-	    ret=$?;
+	    (
+		test_setup && test_run
+		ret=$?
+		test_cleanup
+		exit $ret
+	    ) </dev/null >test.log 2>&1
+	    ret=$?
 	    if [ $ret -eq 0 ]; then
-               rm test.log;
-	       echo "[OK]";
+               rm test.log
+	       echo "[OK]"
 	    else
-	       echo "[FAILED] see $(pwd)/test.log";
-	    fi;
+	       echo "[FAILED]"
+	       echo "see $(pwd)/test.log"
+	    fi
 	    exit $ret;;
         *) break ;;
     esac