[BusyBox-cvs] busybox/testsuite runtest,1.6,1.7

[Erik Andersen]

Update of /var/cvs/busybox/testsuite
In directory nail:/tmp/cvs-serv6982

Modified Files:
	runtest 
Log Message:
Fix the test suite script so it actually works and actually flags
all errors as such.  Make verbose mode exit on FAIL and provide a
printout of the failed test run.


Index: runtest
===================================================================
RCS file: /var/cvs/busybox/testsuite/runtest,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/runtest	27 Mar 2002 17:33:31 -0000	1.6
+++ b/runtest	6 Apr 2004 00:41:39 -0000	1.7
@@ -26,6 +26,7 @@
 
 	local status=0
 	local X=
+	local RES=
 
 	local uc_applet=$(echo $applet | tr a-z A-Z)
 	local testname=$(basename $testcase)
@@ -48,14 +49,22 @@
 		X=X
 	fi
 
-	mkdir tmp
+	rm -rf tmp
+	mkdir -p tmp
 	pushd tmp >/dev/null
 
-	if . ../$testcase >/dev/null 2>&1; then
-		show_result ${X}PASS $testname
+	sh -x -e ../$testcase >.logfile.txt 2>&1
+
+	if [ $? != 0 ] ; then
+		show_result ${X}FAIL $testname
+		if [ "$verbose" == 1 ]; then
+			cat .logfile.txt
+			exit 1;
+		fi;
 		status=$?
 	else
-		show_result ${X}FAIL $testname
+		show_result ${X}PASS $testname
+		rm -f .logfile.txt
 		status=$?
 	fi