From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 11 Nov 2009 10:56:10 +0000 (+1300)
Subject: TestBed: Leave data from failed builds for debug. Fatal on sandpit failure
X-Git-Tag: SQUID_3_2_0_1~587
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2656b9cfbee91b1025ed7912a7a10b3839b2c8e;p=thirdparty%2Fsquid.git

TestBed: Leave data from failed builds for debug. Fatal on sandpit failure
---

diff --git a/test-builds.sh b/test-builds.sh
index 66ee6bc5f2..b1e011fdec 100755
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -59,7 +59,8 @@ buildtest() {
     log=${btlayer}.log
     echo "TESTING: ${layer}"
     chmod -R 777 ${btlayer}
-    rm -f -r ${btlayer} && mkdir ${btlayer}
+    rm -f -r ${btlayer} || ( echo "FATAL: Failed to prepare test build sandpit." ; exit 1 )
+    mkdir ${btlayer}
     if test "${verbose}" = "yes" ; then
         ls -la ${btlayer}
     fi
@@ -93,17 +94,18 @@ buildtest() {
     errors="^ERROR|\ error:|\ Error\ |No\ such|assertion\ failed|FAIL:|:\ undefined"
     grep -E "${errors}" ${log}
 
-    if test "${cleanup}" = "yes" ; then
-	echo "REMOVE DATA: ${btlayer}"
-	chmod -R 777 ${btlayer}
-	rm -f -r ${btlayer}
-    fi
-
     if test $result -eq 0; then
 	# successful execution
 	if test "${verbose}" = "yes"; then
 	    echo "Build OK. Global result is $globalResult."
 	fi
+	if test "${cleanup}" = "yes" ; then
+	    echo "REMOVE DATA: ${btlayer}"
+	    chmod -R 777 ${btlayer}
+	    rm -f -r ${btlayer}
+	    echo "REMOVE LOG: ${log}"
+	    rm -f -r ${log}
+	fi
     else
         if test "${verbose}" != "yes" ; then
             echo "Build Failed. Last log lines are:"
@@ -113,11 +115,6 @@ buildtest() {
         fi
         globalResult=1
     fi
-
-    if test "${cleanup}" = "yes" ; then
-	echo "REMOVE LOG: ${log}"
-	rm -f -r ${log}
-    fi
 }
 
 # if using cache, make sure to clear it up first