7 files changed, 22 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 067322c..10ca748 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2007-06-05  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	PR testsuite/25241
+	* gcc.dg/invalid-call-1.c: Use dg-warning to match the warning and
+	dg-message to match de note.
+	* gcc.dg/pr26570.c: Use dg-message for a note.
+	* gcc.dg/pr29254.c: Use dg-message for generic output and use
+	dg-error instead of dg-warning because of -Werror.
+	* gcc.dg/glibc-uclibc-1.c: Use dg-message for output that is
+	neither an error, nor a warning.
+	* gcc.dg/glibc-uclibc-2.c: Likewise
+	* gcc.dg/cpp/19940712-1.c: Likewise.
+
 2007-06-05  Joerg Wunsch  <j.gnu@uriah.heep.sax.de>
 
 	PR preprocessor/23479
diff --git a/gcc/testsuite/gcc.dg/cpp/19940712-1.c b/gcc/testsuite/gcc.dg/cpp/19940712-1.c
index d5ed889..98bcd76 100644
--- a/gcc/testsuite/gcc.dg/cpp/19940712-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/19940712-1.c
@@ -5,8 +5,8 @@
 /* { dg-error "unterminated comment" "" { target *-*-* } 4 } */
 /* { dg-error "unterminated comment" "header error" { target *-*-* } 8 } */
 
-#include "19940712-1.h"	  /* { dg-error "" }  // In file included from: */
-#include "19940712-1a.h"  /* { dg-error "" }  // In file included from: */
+#include "19940712-1.h"	  /* { dg-message "" }  // In file included from: */
+#include "19940712-1a.h"  /* { dg-message "" }  // In file included from: */
 #include "19940712-1b.h"
 
 /* comment start in comment error
diff --git a/gcc/testsuite/gcc.dg/glibc-uclibc-1.c b/gcc/testsuite/gcc.dg/glibc-uclibc-1.c
index 46c4175..a376404 100644
--- a/gcc/testsuite/gcc.dg/glibc-uclibc-1.c
+++ b/gcc/testsuite/gcc.dg/glibc-uclibc-1.c
@@ -3,4 +3,4 @@
 /* { dg-do link { target *-*-linux* } } */
 /* { dg-options "-mglibc -muclibc" } */
 
-/* { dg-error "-mglibc and -muclibc used together" "" { target *-*-* } 0 } */
+/* { dg-message "-mglibc and -muclibc used together" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/gcc.dg/glibc-uclibc-2.c b/gcc/testsuite/gcc.dg/glibc-uclibc-2.c
index 344fb06..cb52260 100644
--- a/gcc/testsuite/gcc.dg/glibc-uclibc-2.c
+++ b/gcc/testsuite/gcc.dg/glibc-uclibc-2.c
@@ -3,4 +3,4 @@
 /* { dg-do link { target *-*-linux* } } */
 /* { dg-options "-muclibc -mglibc" } */
 
-/* { dg-error "-mglibc and -muclibc used together" "" { target *-*-* } 0 } */
+/* { dg-message "-mglibc and -muclibc used together" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/gcc.dg/invalid-call-1.c b/gcc/testsuite/gcc.dg/invalid-call-1.c
index 2a7d372..1d19c56 100644
--- a/gcc/testsuite/gcc.dg/invalid-call-1.c
+++ b/gcc/testsuite/gcc.dg/invalid-call-1.c
@@ -13,5 +13,6 @@ char* cptr;
 void foo()
 {
   cptr = mar(6);
-  ((char *(*)(void *,int (*)(void *,unsigned char **),char**))((fp)bar))(0,0,(void*)(0)); /* { dg-message "" "non-compatible type" } */
+  ((char *(*)(void *,int (*)(void *,unsigned char **),char**))((fp)bar))(0,0,(void*)(0)); /* { dg-warning "function called through a non-compatible type" "non-compatible type" } */
+  /* { dg-message "note: if this code is reached, the program will abort" "" { target *-*-* } 16 } */
 }
diff --git a/gcc/testsuite/gcc.dg/pr26570.c b/gcc/testsuite/gcc.dg/pr26570.c
index efae8d6..5f67c00 100644
--- a/gcc/testsuite/gcc.dg/pr26570.c
+++ b/gcc/testsuite/gcc.dg/pr26570.c
@@ -4,6 +4,6 @@
 unsigned test (unsigned a, unsigned b)
 {
   return a / b;
-} /* { dg-warning "execution counts estimated" } */
+} /* { dg-message "note: \[^\n\]*execution counts estimated" } */
 
 /* { dg-final { cleanup-coverage-files } } */
diff --git a/gcc/testsuite/gcc.dg/pr29254.c b/gcc/testsuite/gcc.dg/pr29254.c
index 6259089..98846a9 100644
--- a/gcc/testsuite/gcc.dg/pr29254.c
+++ b/gcc/testsuite/gcc.dg/pr29254.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O3 -Werror" } */
-/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */
+/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */
 
 list_compare (int * list1)
 {
@@ -18,5 +18,5 @@ value_compare (int * a)
 
 func2 (const int * fb)
 {
-  func1 ((int *) fb); /* { dg-warning "discards qualifiers" } */
+  func1 ((int *) fb); /* { dg-error "discards qualifiers" } */
 }