[STAGE1] Add prefix to test verification in guality.h

Submitted by Martin Liška on April 20, 2017, 11:38 a.m.

Details

Message ID dcf40b87-fac4-d266-bf6a-61a28e6ee316@suse.cz
State New
Headers show

Commit Message

Martin Liška April 20, 2017, 11:38 a.m.
Hello.

Currently tests that include guality.h header file and us the fancy macros
for verification produce output like:

FAIL: o is -1, not 268566560
FAIL: w is -1, not 268566624
FAIL: w is -1, not 268566624
FAIL: o is -1, not 268566576
FAIL: w is -1, not 268566624
FAIL: w is -1, not 268566624
FAIL: o is -1, not 268566592

which is quite unpleasant to find a name of test which is responsible for that.
Thus, I'm suggesting to add prefix for the messages coming from the header file
to:

FAIL: guality/guality.h: w is -1, not 6299888
FAIL: guality/guality.h: w is -1, not 6299888
FAIL: guality/guality.h: w is -1, not 6299888
FAIL: guality/guality.h: w is -1, not 6299888
FAIL: guality/guality.h: ret is -1, not 6299872
FAIL: guality/guality.h: e is -1, not 6299888
FAIL: guality/guality.h: e is -1, not 6299888
FAIL: guality/guality.h: e is -1, not 6299888

Ready to be installed?
Thanks,
Martin

Patch hide | download patch | download mbox

From 4895528a00883afb843f1e493388489472ed7145 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Thu, 20 Apr 2017 13:27:38 +0200
Subject: [PATCH] Add prefix to test verification in guality.h

gcc/testsuite/ChangeLog:

2017-04-20  Martin Liska  <mliska@suse.cz>

	* gcc.dg/guality/guality.h: Add prefix to test verification.
---
 gcc/testsuite/gcc.dg/guality/guality.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/guality/guality.h b/gcc/testsuite/gcc.dg/guality/guality.h
index d5867d8ba96..94722510ff0 100644
--- a/gcc/testsuite/gcc.dg/guality/guality.h
+++ b/gcc/testsuite/gcc.dg/guality/guality.h
@@ -55,6 +55,8 @@  along with GCC; see the file COPYING3.  If not see
    so that __FILE__ and __LINE__ will be usable to identify them.
 */
 
+#define GUALITY_TEST "guality/guality.h"
+
 /* This is the type we use to pass values to guality_check.  */
 
 typedef intmax_t gualchk_t;
@@ -274,7 +276,7 @@  continue\n\
 
   i = guality_count[INCORRECT];
 
-  fprintf (stderr, "%s: %i PASS, %i FAIL, %i UNRESOLVED\n",
+  fprintf (stderr, "%s: " GUALITY_TEST  ": %i PASS, %i FAIL, %i UNRESOLVED\n",
 	   i ? "FAIL" : "PASS",
 	   guality_count[PASS], guality_count[INCORRECT],
 	   guality_count[INCOMPLETE]);
@@ -361,13 +363,13 @@  continue\n\
     switch (result)
       {
       case PASS:
-	fprintf (stderr, "PASS: %s is %lli\n", name, value);
+	fprintf (stderr, "PASS: " GUALITY_TEST ": %s is %lli\n", name, value);
 	break;
       case INCORRECT:
-	fprintf (stderr, "FAIL: %s is %lli, not %lli\n", name, xvalue, value);
+	fprintf (stderr, "FAIL: " GUALITY_TEST ": %s is %lli, not %lli\n", name, xvalue, value);
 	break;
       case INCOMPLETE:
-	fprintf (stderr, "%s: %s is %s, expected %lli\n",
+	fprintf (stderr, "%s: " GUALITY_TEST ": %s is %s, expected %lli\n",
 		 unknown_ok ? "UNRESOLVED" : "FAIL", name,
 		 unavailable < 0 ? "not computable" : "optimized away", value);
 	result = unknown_ok ? INCOMPLETE : INCORRECT;
-- 
2.12.2