PATCH COMMITTED: more uses of dg-message

[Manuel López-Ibáñez]

More fixes for the testsuite because of dg-message. Approved by Janis
Johnson and commited as revision 125505.

2007-06-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

  PR testsuite/25241
  * gcc.dg/simd-5.c: Mark output as a note.
  * gcc.dg/simd-6.c: Mark output as a note. Fix incorrect use of dg-message.
  * gcc.dg/simd-1.c: Likewise.
  * gcc.dg/always_inline.c: Mark output as a sorry.
  * gcc.dg/always_inline2.c: Likewise.
  * gcc.dg/always_inline3.c: Likewise.
-------------- next part --------------
Index: gcc/testsuite/gcc.dg/simd-5.c
===================================================================
--- gcc/testsuite/gcc.dg/simd-5.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/simd-5.c	(working copy)
@@ -2,7 +2,7 @@
 /* { dg-options "-O2 -std=gnu89" } */
 
 /* Ensure that we don't need a typedef to initialize a vector type.  */
 #define vector __attribute__ ((vector_size (8)))
 vector char x = (vector char) {1,2,3,4,5,6,7,8}; /* { dg-bogus "initializer" } */
-vector char y = (vector short) {1,2,3,4}; /* { dg-message "use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
+vector char y = (vector short) {1,2,3,4}; /* { dg-message "note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
   /* { dg-error "incompatible types in initialization" "" { target *-*-* } 7 } */
Index: gcc/testsuite/gcc.dg/always_inline.c
===================================================================
--- gcc/testsuite/gcc.dg/always_inline.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/always_inline.c	(working copy)
@@ -1,9 +1,9 @@
 /* { dg-do compile } */
 /* { dg-options "-Winline -O2" } */
 #include <stdarg.h>
 inline __attribute__ ((always_inline)) void
 e(int t, ...)
-{				/* { dg-message "variable argument" "" } */
+{				/* { dg-message "sorry\[^\n\]*variable argument" "" } */
   va_list q;
   va_start (q, t);
 }
Index: gcc/testsuite/gcc.dg/always_inline3.c
===================================================================
--- gcc/testsuite/gcc.dg/always_inline3.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/always_inline3.c	(working copy)
@@ -1,11 +1,11 @@
 /* { dg-do compile } */
 /* { dg-options "-Winline -O2" } */
 int do_something_evil (void);
 inline __attribute__ ((always_inline)) void
 q2(void)
-{ 				/* { dg-message "recursive" "" } */
+{ 				/* { dg-message "sorry\[^\n\]*recursive" "" } */
   if (do_something_evil ())
     return;
-  q2(); 			/* { dg-message "called from here" "" } */
+  q2(); 			/* { dg-message "sorry\[^\n\]*called from here" "" } */
   q2(); /* With -O2 we don't warn here, it is eliminated by tail recursion.  */
 }
Index: gcc/testsuite/gcc.dg/simd-6.c
===================================================================
--- gcc/testsuite/gcc.dg/simd-6.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/simd-6.c	(working copy)
@@ -2,7 +2,7 @@
 /* { dg-options "-O2 -std=gnu99" } */
 
 /* Ensure that we don't need a typedef to initialize a vector type.  */
 #define vector __attribute__ ((vector_size (8)))
 vector char x = (vector char) {1,2,3,4,5,6,7,8}; /* { dg-bogus "initializer" } */
-vector char y = (vector short) {1,2,3,4}; /* { dg-message "use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
-	/* { dg-message "incompatible types in initialization" "" { target *-*-* } 7 } */
+vector char y = (vector short) {1,2,3,4}; /* { dg-message "note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
+  /* { dg-error "incompatible types in initialization" "" { target *-*-* } 7 } */
Index: gcc/testsuite/gcc.dg/simd-1.c
===================================================================
--- gcc/testsuite/gcc.dg/simd-1.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/simd-1.c	(working copy)
@@ -30,11 +30,12 @@ hanneke ()
 
   /* Casting between SIMDs of the same size.  */
   e = (typeof (e)) a;
 
   /* Different signed SIMD assignment.  */
-  f = a; /* { dg-error "use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts.*35: error: incompatible types in assignment" } */
+  f = a; /* { dg-message "note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
+  /* { dg-error "incompatible types in assignment" "" { target *-*-* } 35 } */
 
   /* Casted different signed SIMD assignment.  */
   f = (uv4si) a;
 
   /* Assignment between scalar and SIMD of different size.  */
Index: gcc/testsuite/gcc.dg/always_inline2.c
===================================================================
--- gcc/testsuite/gcc.dg/always_inline2.c	(revision 125347)
+++ gcc/testsuite/gcc.dg/always_inline2.c	(working copy)
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-Winline -O2" } */
-inline __attribute__ ((always_inline)) void t(void); /* { dg-message "body not available" "" } */
+inline __attribute__ ((always_inline)) void t(void); /* { dg-message "sorry\[^\n\]*body not available" "" } */
 void
 q(void)
 {
-  t(); 				/* { dg-message "called from here" "" } */
+  t(); 				/* { dg-message "sorry\[^\n\]*called from here" "" } */
 }