From 8750c38e7162823910dc48783ef624c092e4c1a4 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 4 Sep 2009 00:22:56 +1200
Subject: [PATCH] TestBed: polish verbose mode a little

 - make the master script only show the 'lst lines' summary when not
   dumping the entire log anyway for vebose display

 - make verbose mode show whats in the test directory when starting a build.

 - make each run display the list of files/folders after distclean
---
 test-builds.sh          | 15 +++++++++++----
 test-suite/buildtest.sh |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/test-builds.sh b/test-builds.sh
index e74bd38c41..8aaf47b476 100755
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -45,6 +45,9 @@ buildtest() {
     echo "TESTING: ${layer}"
     chmod -R 777 ${btlayer}
     rm -f -r ${btlayer} && mkdir ${btlayer}
+    if test "${verbose}" = "yes" ; then
+        ls -la ${btlayer}
+    fi
     {
 	result=255
 	cd ${btlayer}
@@ -83,13 +86,17 @@ buildtest() {
 
     if test $result -eq 0; then
 	# successful execution
-	if test "$verbose" = yes; then
+	if test "${verbose}" = "yes"; then
 	    echo "Build OK. Global result is $globalResult."
 	fi
     else
-        echo "Build Failed. Last log lines are:"
-        tail -20 ${log}
-	globalResult=1
+        if test "${verbose}" != "yes" ; then
+            echo "Build Failed. Last log lines are:"
+            tail -20 ${log}
+        else
+            echo "Build FAILED."
+        fi
+        globalResult=1
     fi
 
     if test "${cleanup}" = "yes" ; then
diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh
index caaf0fa713..41537015f1 100755
--- a/test-suite/buildtest.sh
+++ b/test-suite/buildtest.sh
@@ -31,7 +31,8 @@ fi
 FILECOUNT=`ls -1 | grep -c .`
 if test "${FILECOUNT}" != "0" ; then
   make -k distclean || echo "distclean done. errors are unwanted but okay here."
-  rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps
+  ls -la .
+  rm -fr ./src/fs/aufs/.deps src/fs/diskd/.deps
 fi
 
 #
-- 
2.47.3