This patch modifies miscellaneous tests in gcc/testsuite/gcc.dg to
specify comments in dg-message/dg-warning/dg-error test directives for
checks for multiple messages for the same line of source code.
Tested on i686-pc-linux-gnu. OK for mainline?
Janis
2012-06-13 Janis Johnson <jani...@codesourcery.com>
* gcc.dg/di-longlong64-sync-1.c: Add comments to checks for multiple
messages reported for one line of source code.
* gcc.dg/format/few-1.c: Likewise.
* gcc.dg/ia64-sync-2.c: Likewise.
* gcc.dg/sync-2.c: Likewise.
* gcc.dg/noncompile/pr44517.c: Likewise.
* gcc.dg/noncompile/pr52290.c: Likewise.
Index: gcc.dg/di-longlong64-sync-1.c
===================================================================
--- gcc.dg/di-longlong64-sync-1.c (revision 188482)
+++ gcc.dg/di-longlong64-sync-1.c (working copy)
@@ -3,8 +3,8 @@
/* { dg-options "-std=gnu99" } */
/* { dg-additional-options "-march=pentium" { target { { i?86-*-* x86_64-*-* }
&& ia32 } } } */
-/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
-/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"fetch_and_nand" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"nand_and_fetch" { target *-*-* } 0 } */
/* Test basic functionality of the intrinsics. The operations should
Index: gcc.dg/format/few-1.c
===================================================================
--- gcc.dg/format/few-1.c (revision 188482)
+++ gcc.dg/format/few-1.c (working copy)
@@ -4,15 +4,15 @@
int f(int *ip, char *cp)
{
__builtin_printf ("%*.*s");
-/* { dg-warning "field width specifier '\\*' expects a matching 'int'
argument" "" { target *-*-* } 6 } */
-/* { dg-warning "field precision specifier '\\.\\*' expects a matching 'int'
argument" "" { target *-*-* } 6 } */
-/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "" {
target *-*-* } 6 } */
+/* { dg-warning "field width specifier '\\*' expects a matching 'int'
argument" "width" { target *-*-* } 6 } */
+/* { dg-warning "field precision specifier '\\.\\*' expects a matching 'int'
argument" "precision" { target *-*-* } 6 } */
+/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format"
{ target *-*-* } 6 } */
__builtin_printf ("%*.*s", ip, *cp);
-/* { dg-warning "field width specifier '\\*' expects argument of type 'int'"
"" { target *-*-* } 10 } */
-/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "" {
target *-*-* } 10 } */
+/* { dg-warning "field width specifier '\\*' expects argument of type 'int'"
"width" { target *-*-* } 10 } */
+/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format"
{ target *-*-* } 10 } */
__builtin_printf ("%s %i", ip, ip);
-/* { dg-warning "format '%s' expects argument of type 'char \\*'" "" { target
*-*-* } 13 } */
-/* { dg-warning "format '%i' expects argument of type 'int'" "" { target *-*-*
} 13 } */
+/* { dg-warning "format '%s' expects argument of type 'char \\*'" "char" {
target *-*-* } 13 } */
+/* { dg-warning "format '%i' expects argument of type 'int'" "int" { target
*-*-* } 13 } */
__builtin_printf ("%s %i", cp);
/* { dg-warning "format '%i' expects a matching 'int' argument" "" { target
*-*-* } 16 } */
__builtin_printf ("%lc");
Index: gcc.dg/ia64-sync-2.c
===================================================================
--- gcc.dg/ia64-sync-2.c (revision 188482)
+++ gcc.dg/ia64-sync-2.c (working copy)
@@ -4,8 +4,8 @@
/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } }
*/
/* { dg-options "-mcpu=v9" { target sparc*-*-* } } */
-/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
-/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"fetch_and_nand" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"nand_and_fetch" { target *-*-* } 0 } */
/* Test basic functionality of the intrinsics. */
Index: gcc.dg/sync-2.c
===================================================================
--- gcc.dg/sync-2.c (revision 188482)
+++ gcc.dg/sync-2.c (working copy)
@@ -4,8 +4,8 @@
/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } }
*/
/* { dg-options "-mcpu=v9" { target sparc*-*-* } } */
-/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
-/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4"
"fetch_and_nand" { target *-*-* } 0 } */
+/* { dg-message "note: '__sync_nand_and_fetch' changed semantics in GCC 4.4"
"nand_and_fetch" { target *-*-* } 0 } */
/* Test functionality of the intrinsics for 'short' and 'char'. */
Index: gcc.dg/noncompile/pr44517.c
===================================================================
--- gcc.dg/noncompile/pr44517.c (revision 188482)
+++ gcc.dg/noncompile/pr44517.c (working copy)
@@ -1,7 +1,7 @@
/* PR c/44517: Improve diagnostic for misspelled typename in function
declaration. */
int f1(int x, pid_t y, long z, in t) {
-/* { dg-error "unknown type name 'pid_t'" "" { target *-*-* } 2 } */
-/* { dg-error "unknown type name 'in'" "" { target *-*-* } 2 } */
+/* { dg-error "unknown type name 'pid_t'" "pid_t" { target *-*-* } 2 } */
+/* { dg-error "unknown type name 'in'" "in" { target *-*-* } 2 } */
return x + y + z + t;
}
Index: gcc.dg/noncompile/pr52290.c
===================================================================
--- gcc.dg/noncompile/pr52290.c (revision 188482)
+++ gcc.dg/noncompile/pr52290.c (working copy)
@@ -1,3 +1,3 @@
-/* { dg-error "undeclared here" "" { target *-*-* } 3 } */
-/* { dg-error "expected" "" { target *-*-* } 3 } */
+/* { dg-error "undeclared here" "undeclared" { target *-*-* } 3 } */
+/* { dg-error "expected" "expected" { target *-*-* } 3 } */
int f()[j]
