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 2ef573df627e8773d73418ae66e58812321d6fd5..bc0ddb615d875bd425239769c6e854f54e71c06b 100644 (file)
--- 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 2ef573df627e8773d73418ae66e58812321d6fd5..bc0ddb615d875bd425239769c6e854f54e71c06b 100644 (file)
--- 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 0e18e9756e08040bd281084f70f9b5561eab2b45..7b219ba4955a60a7f43281398e39b24b9ba6f90a 100644 (file)
--- 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