From: Harald Hoyer <harald@redhat.com>
Date: Fri, 5 Jun 2009 14:08:30 +0000 (+0200)
Subject: make test output more readable, log errors to test.log
X-Git-Tag: 0.1~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3273c0a5367985a5534783ed4dca780fa9633d4a;p=thirdparty%2Fdracut.git

make test output more readable, log errors to test.log
---

diff --git a/test/TEST-10-RAID/Makefile b/test/TEST-10-RAID/Makefile
index 2ef573df6..bc0ddb615 100644
--- a/test/TEST-10-RAID/Makefile
+++ b/test/TEST-10-RAID/Makefile
@@ -1,8 +1,8 @@
 all:
-	make -C ../.. all
+	@make -s --no-print-directory -C ../.. all
 	@basedir=../.. testdir=../ ./test.sh --all
 setup:
-	make -C ../.. all
+	@make --no-print-directory -C ../.. all
 	@basedir=../.. testdir=../ ./test.sh --setup
 clean:
 	@basedir=../.. testdir=../ ./test.sh --clean
diff --git a/test/TEST-20-NFS/Makefile b/test/TEST-20-NFS/Makefile
index 2ef573df6..bc0ddb615 100644
--- a/test/TEST-20-NFS/Makefile
+++ b/test/TEST-20-NFS/Makefile
@@ -1,8 +1,8 @@
 all:
-	make -C ../.. all
+	@make -s --no-print-directory -C ../.. all
 	@basedir=../.. testdir=../ ./test.sh --all
 setup:
-	make -C ../.. all
+	@make --no-print-directory -C ../.. all
 	@basedir=../.. testdir=../ ./test.sh --setup
 clean:
 	@basedir=../.. testdir=../ ./test.sh --clean
diff --git a/test/test-functions b/test/test-functions
index 0e18e9756..7b219ba49 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -13,15 +13,16 @@ while (($# > 0)); do
 	    test_cleanup;
 	    exit $?;;
         --all) 
-	    echo "TEST: $TEST_DESCRIPTION";
-	    test_setup && test_run && test_cleanup;
+	    echo -n "TEST: $TEST_DESCRIPTION ";
+	    { test_setup && test_run && test_cleanup; } </dev/null >test.log 2>&1;
 	    ret=$?;
 	    if [ $ret -eq 0 ]; then
-	       echo "$TEST_DESCRIPTION [OK]";
+               rm test.log;
+	       echo "[OK]";
 	    else
-	       echo "$TEST_DESCRIPTION [FAILED]";
-	    fi
-	    exit $?;;
+	       echo "[FAILED] see $(pwd)/test.log";
+	    fi;
+	    exit $ret;;
         *) break ;;
     esac
     shift