Catch "errors" and update report format

svn path=/trunk/yasm/; revision=506

modules/preprocs/yapp/tests/yapp_test.sh

@@ -9,8 +9,10 @@ passedct=0
 passedlist=''
 failedct=0
 failedlist=''
+errorct=0
+errorlist=''
 
-YT=" - YAPP_TEST"
+YT="yapp_test"
 
 
 for asm in ${srcdir}/src/preprocs/yapp/tests/*.asm
@@ -19,19 +21,29 @@ do
     y=${a}.yp
     p=`echo ${asm} | sed -e 's,.asm$,.pre,'`
 
-    echo "$YT: Testing yapp for ${a}"
+    echo -n "$YT: Testing yapp for ${a} ..."
-    ./yasm -e ${asm} > ${y}
+    if ./yasm -e ${asm} > ${y}; then
-    if diff -w ${p} ${y} > /dev/null; then
+	if diff -w ${p} ${y} > /dev/null; then
-	passedct=`expr $passedct + 1`
+	    echo " PASS."
-	passedlist="${passedlist}${a} "
+	    passedct=`expr $passedct + 1`
+	    passedlist="${passedlist}${a} "
+	else
+	    echo " FAIL."
+	    failedct=`expr $failedct + 1`
+	    failedlist="${failedlist}${a} "
+	fi
     else
-	failedct=`expr $failedct + 1`
+	errorct=`expr $errorct + 1`
-	failedlist="${failedlist}${a} "
+	errorlist="${errorlist}${a} "
     fi
-    #rm ${y}
 done
 
-test $passedct -gt 0 && echo "$YT: PASSED $passedct: $passedlist"
+ct=`expr $failedct + $passedct + $errorct`
-test $failedct -gt 0 && echo "$YT: FAILED $failedct: $failedlist"
+per=`expr 100 \* $passedct / $ct`
 
-exit $failedct
+echo "$YT: $per%: Checks: $ct, Failures $failedct, Errors: $errorct"
+#test $passedct -gt 0 && echo "$YT: PASSED $passedct: $passedlist"
+#test $failedct -gt 0 && echo "$YT: FAILED $failedct: $failedlist"
+#test $errorct -gt 0 && echo "$YT: ERRORED $errorct: $errorlist"
+
+exit `expr $failedct + $errorct`

src/preprocs/yapp/tests/yapp_test.sh

@@ -9,8 +9,10 @@ passedct=0
 passedlist=''
 failedct=0
 failedlist=''
+errorct=0
+errorlist=''
 
-YT=" - YAPP_TEST"
+YT="yapp_test"
 
 
 for asm in ${srcdir}/src/preprocs/yapp/tests/*.asm
@@ -19,19 +21,29 @@ do
     y=${a}.yp
     p=`echo ${asm} | sed -e 's,.asm$,.pre,'`
 
-    echo "$YT: Testing yapp for ${a}"
+    echo -n "$YT: Testing yapp for ${a} ..."
-    ./yasm -e ${asm} > ${y}
+    if ./yasm -e ${asm} > ${y}; then
-    if diff -w ${p} ${y} > /dev/null; then
+	if diff -w ${p} ${y} > /dev/null; then
-	passedct=`expr $passedct + 1`
+	    echo " PASS."
-	passedlist="${passedlist}${a} "
+	    passedct=`expr $passedct + 1`
+	    passedlist="${passedlist}${a} "
+	else
+	    echo " FAIL."
+	    failedct=`expr $failedct + 1`
+	    failedlist="${failedlist}${a} "
+	fi
     else
-	failedct=`expr $failedct + 1`
+	errorct=`expr $errorct + 1`
-	failedlist="${failedlist}${a} "
+	errorlist="${errorlist}${a} "
     fi
-    #rm ${y}
 done
 
-test $passedct -gt 0 && echo "$YT: PASSED $passedct: $passedlist"
+ct=`expr $failedct + $passedct + $errorct`
-test $failedct -gt 0 && echo "$YT: FAILED $failedct: $failedlist"
+per=`expr 100 \* $passedct / $ct`
 
-exit $failedct
+echo "$YT: $per%: Checks: $ct, Failures $failedct, Errors: $errorct"
+#test $passedct -gt 0 && echo "$YT: PASSED $passedct: $passedlist"
+#test $failedct -gt 0 && echo "$YT: FAILED $failedct: $failedlist"
+#test $errorct -gt 0 && echo "$YT: ERRORED $errorct: $errorlist"
+
+exit `expr $failedct + $errorct`