re PR testsuite/25241 ([C++] DejaGNU does not distinguish between errors and warnings)

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

	PR testsuite/25241

testsuite/
	* 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.

From-SVN: r125505

7 files changed, 21 insertions, 9 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3917a80..2e07a8a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+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.
+	
 2007-06-06  Ian Lance Taylor  <iant@google.com>
 
 	* g++.dg/conversion/enum1.C: New test.
diff --git a/gcc/testsuite/gcc.dg/always_inline.c b/gcc/testsuite/gcc.dg/always_inline.c
index 1c04ac8..3233741 100644
--- a/gcc/testsuite/gcc.dg/always_inline.c
+++ b/gcc/testsuite/gcc.dg/always_inline.c
@@ -3,7 +3,7 @@
 #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);
 }
diff --git a/gcc/testsuite/gcc.dg/always_inline2.c b/gcc/testsuite/gcc.dg/always_inline2.c
index 7e488eb..c65df24 100644
--- a/gcc/testsuite/gcc.dg/always_inline2.c
+++ b/gcc/testsuite/gcc.dg/always_inline2.c
@@ -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" "" } */
 }
diff --git a/gcc/testsuite/gcc.dg/always_inline3.c b/gcc/testsuite/gcc.dg/always_inline3.c
index 369bb87..db06843 100644
--- a/gcc/testsuite/gcc.dg/always_inline3.c
+++ b/gcc/testsuite/gcc.dg/always_inline3.c
@@ -3,9 +3,9 @@
 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.  */
 }
diff --git a/gcc/testsuite/gcc.dg/simd-1.c b/gcc/testsuite/gcc.dg/simd-1.c
index 08be780..d0064ad4 100644
--- a/gcc/testsuite/gcc.dg/simd-1.c
+++ b/gcc/testsuite/gcc.dg/simd-1.c
@@ -32,7 +32,8 @@ hanneke ()
   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;
diff --git a/gcc/testsuite/gcc.dg/simd-5.c b/gcc/testsuite/gcc.dg/simd-5.c
index 0721625..2a31470 100644
--- a/gcc/testsuite/gcc.dg/simd-5.c
+++ b/gcc/testsuite/gcc.dg/simd-5.c
@@ -4,5 +4,5 @@
 /* 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 } */
diff --git a/gcc/testsuite/gcc.dg/simd-6.c b/gcc/testsuite/gcc.dg/simd-6.c
index 386f02e..d8ae1a5 100644
--- a/gcc/testsuite/gcc.dg/simd-6.c
+++ b/gcc/testsuite/gcc.dg/simd-6.c
@@ -4,5 +4,5 @@
 /* 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 } */