From: Peter Johnson <peter@tortall.net>
Date: Sat, 16 Sep 2006 05:48:10 +0000 (-0000)
Subject: Actually use $ECHO_C in test shell scripts.
X-Git-Tag: v0.6.0~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a1a43039acc962d07b9fff182328662806de533;p=yasm

Actually use $ECHO_C in test shell scripts.

svn path=/trunk/yasm/; revision=1618
---

diff --git a/modules/preprocs/yapp/tests/yapp_test.sh b/modules/preprocs/yapp/tests/yapp_test.sh
index 3f5fbb1c..a8e255d8 100755
--- a/modules/preprocs/yapp/tests/yapp_test.sh
+++ b/modules/preprocs/yapp/tests/yapp_test.sh
@@ -21,7 +21,7 @@ failedct=0
 YT="yapp_test"
 
 
-echo $ECHO_N "Test $YT: "
+echo $ECHO_N "Test $YT: $ECHO_C"
 for asm in ${srcdir}/modules/preprocs/yapp/tests/*.asm
 do
     a=`echo ${asm} | sed 's,^.*/,,;s,.asm$,,'`
@@ -38,25 +38,25 @@ do
     status=$?
     if test $status -gt 128; then
 	# We should never get a coredump!
-	echo $ECHO_N "C"
+	echo $ECHO_N "C$ECHO_C"
         eval "failed$failedct='C: ${a} crashed!'"
 	failedct=`expr $failedct + 1`
     elif test $status -gt 0; then
 	echo ${asm} | grep err >/dev/null
        	if test $? -gt 0; then
 	    # YASM detected errors but shouldn't have!
-	    echo $ECHO_N "E"
+	    echo $ECHO_N "E$ECHO_C"
             eval "failed$failedct='E: ${a} returned an error code!'"
 	    failedct=`expr $failedct + 1`
 	else
 	    # We got errors, check to see if they match:
 	    if diff -w ${eg} results/${e} >/dev/null; then
 		# Error/warnings match, it passes!
-		echo $ECHO_N "."
+		echo $ECHO_N ".$ECHO_C"
 		passedct=`expr $passedct + 1`
 	    else
 		# Error/warnings don't match.
-		echo $ECHO_N "W"
+		echo $ECHO_N "W$ECHO_C"
                 eval "failed$failedct='W: ${a} did not match errors and warnings!'"
 		failedct=`expr $failedct + 1`
 	    fi
@@ -65,24 +65,24 @@ do
 	echo ${asm} | grep -v err >/dev/null
        	if test $? -gt 0; then
 	    # YASM detected errors but shouldn't have!
-	    echo $ECHO_N "E"
+	    echo $ECHO_N "E$ECHO_C"
             eval "failed$failedct='E: ${a} returned an error code!'"
 	    failedct=`expr $failedct + 1`
 	else
 	    if diff -w ${og} results/${o} >/dev/null; then
 		if diff -w ${eg} results/${e} >/dev/null; then
 		    # Both output file and error/warnings match, it passes!
-		    echo $ECHO_N "."
+		    echo $ECHO_N ".$ECHO_C"
 		    passedct=`expr $passedct + 1`
 		else
 		    # Error/warnings don't match.
-		    echo $ECHO_N "W"
+		    echo $ECHO_N "W$ECHO_C"
                     eval "failed$failedct='W: ${a} did not match errors and warnings!'"
 		    failedct=`expr $failedct + 1`
 		fi
 	    else
 		# Output file doesn't match.
-		echo $ECHO_N "O"
+		echo $ECHO_N "O$ECHO_C"
                 eval "failed$failedct='O: ${a} did not match output file!'"
 		failedct=`expr $failedct + 1`
 	    fi
diff --git a/out_test.sh b/out_test.sh
index 58d5430f..e7f55acb 100755
--- a/out_test.sh
+++ b/out_test.sh
@@ -17,7 +17,7 @@ mkdir results >/dev/null 2>&1
 passedct=0
 failedct=0
 
-echo $ECHO_N "Test $1: "
+echo $ECHO_N "Test $1: $ECHO_C"
 for asm in ${srcdir}/$2/*.asm
 do
     a=`echo ${asm} | sed 's,^.*/,,;s,.asm$,,'`
@@ -35,25 +35,25 @@ do
     status=$?
     if test $status -gt 128; then
 	# We should never get a coredump!
-	echo $ECHO_N "C"
+	echo $ECHO_N "C$ECHO_C"
         eval "failed$failedct='C: ${a} crashed!'"
 	failedct=`expr $failedct + 1`
     elif test $status -gt 0; then
 	echo ${asm} | grep err >/dev/null
        	if test $? -gt 0; then
 	    # YASM detected errors but shouldn't have!
-	    echo $ECHO_N "E"
+	    echo $ECHO_N "E$ECHO_C"
             eval "failed$failedct='E: ${a} returned an error code!'"
 	    failedct=`expr $failedct + 1`
 	else
 	    # We got errors, check to see if they match:
 	    if diff -w ${eg} results/${e} >/dev/null; then
 		# Error/warnings match, it passes!
-		echo $ECHO_N "."
+		echo $ECHO_N ".$ECHO_C"
 		passedct=`expr $passedct + 1`
 	    else
 		# Error/warnings don't match.
-		echo $ECHO_N "W"
+		echo $ECHO_N "W$ECHO_C"
                 eval "failed$failedct='W: ${a} did not match errors and warnings!'"
 		failedct=`expr $failedct + 1`
 	    fi
@@ -62,7 +62,7 @@ do
 	echo ${asm} | grep -v err >/dev/null
        	if test $? -gt 0; then
 	    # YASM detected errors but shouldn't have!
-	    echo $ECHO_N "E"
+	    echo $ECHO_N "E$ECHO_C"
             eval "failed$failedct='E: ${a} returned an error code!'"
 	    failedct=`expr $failedct + 1`
 	else
@@ -70,17 +70,17 @@ do
 	    if diff ${og} results/${oh} >/dev/null; then
 		if diff -w ${eg} results/${e} >/dev/null; then
 		    # Both object file and error/warnings match, it passes!
-		    echo $ECHO_N "."
+		    echo $ECHO_N ".$ECHO_C"
 		    passedct=`expr $passedct + 1`
 		else
 		    # Error/warnings don't match.
-		    echo $ECHO_N "W"
+		    echo $ECHO_N "W$ECHO_C"
                     eval "failed$failedct='W: ${a} did not match errors and warnings!'"
 		    failedct=`expr $failedct + 1`
 		fi
 	    else
 		# Object file doesn't match.
-		echo $ECHO_N "O"
+		echo $ECHO_N "O$ECHO_C"
                 eval "failed$failedct='O: ${a} did not match object file!'"
 		failedct=`expr $failedct + 1`
 	    fi