test-framework.awk: Change recording and printing of passes and failures.

	* gcc.test-framework/test-framework.awk: Change recording and
	printing of passes and failures.

From-SVN: r94549

2 files changed, 34 insertions, 12 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c572d3c..7a3356c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-01  Janis Johnson  <janis187@us.ibm.com>
 
+	* gcc.test-framework/test-framework.awk: Change recording and
+	printing of passes and failures.
+
 	* gcc.test-framework: New directory.
 	* gcc.test-framework/README: New.
 	* gcc.test-framework/test-framework.exp: New.
diff --git a/gcc/testsuite/gcc.test-framework/test-framework.awk b/gcc/testsuite/gcc.test-framework/test-framework.awk
index cddcb4c..90e76ca 100644
--- a/gcc/testsuite/gcc.test-framework/test-framework.awk
+++ b/gcc/testsuite/gcc.test-framework/test-framework.awk
@@ -19,24 +19,43 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-BEGIN			{ skip = 1; pass = 0 }
+function pass(msg)	{
+			  passes++;
+			# printf("pass   %s\n", $0);
+			}
+function fail(msg)	{
+			  fails++;
+			  printf("fail   %s\n", $0);
+			}
+function ignore(msg)	{
+			# printf("ignore %s\n", $0);
+			}
+
+BEGIN			{ skip = 1; passes = 0; fails = 0; }
 /Running.*test-frame/	{ skip = 0; next }
 /gcc Summary/		{ skip = 1; next }
 			{ if (skip) next }
 /^$/			{ next }
 # The post tests are always expected to pass.
-/^PASS.*-2.c/		{ next }
+/^PASS.*-2.c/		{ ignore(); next }
 # dg-xfail-if applies to the compile step; these should be XPASS for the
 # compile step on dox tests, which are run tests.
-/^XPASS.*dox.*xiff.*-1.c.*(test for excess errors)/ { next }
+/^XPASS.*dox.*xiff.*-1.c.*(test for excess errors)/ { ignore(); next }
 # xfail for scan-assembler-not tests doesn't apply to the compile step.
-/^PASS.*sa.*-1.c.*(test for excess errors)/ { next }
+/^PASS.*sa.*-1.c.*(test for excess errors)/ { ignore(); next }
 # The other dox tests pass the compile step; ignore that message.
-/^PASS.*dox.*(test for excess errors)/ { next }
-/^PASS/			{ if (match ($0, "exp-P")) { pass++; next } }
-/^FAIL/			{ if (match ($0, "exp-F")) { pass++; next } }
-/^XPASS/		{ if (match ($0, "exp-XP")) { pass++; next } }
-/^XFAIL/		{ if (match ($0, "exp-XF")) { pass++; next } }
-/^UNSUPPORTED/		{ if (match ($0, "exp-U")) { pass++; next } }
-			{ print }
-END			{ printf("%d tests passed\n", pass) }
+/^PASS.*dox.*(test for excess errors)/ { ignore(); next }
+# Ignore lines that begin with comma.
+/^,/			{ ignore(); next }
+/^PASS/			{ if (match ($0, "exp-P")) { pass(); next } }
+/^FAIL/			{ if (match ($0, "exp-F")) { pass(); next } }
+/^XPASS/		{ if (match ($0, "exp-XP")) { pass(); next } }
+/^XFAIL/		{ if (match ($0, "exp-XF")) { pass(); next } }
+/^UNSUPPORTED/		{ if (match ($0, "exp-U")) { pass(); next } }
+			{ fail() }
+END			{
+			  printf("\n\t\t=== Test Framework Summary ===\n\n");
+			  printf("# of expected passes\t\t%d\n", passes);
+			  if (fails != 0)
+			    printf("# of unexpected failures\t%d\n", fails);
+			}