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

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

	PR testsuite/25241
testsuite/
	* gcc.dg/pch/valid-1.c: Match each diagnostic with its own directive.
	* gcc.dg/pch/valid-2.c: Likewise.
	* gcc.dg/pch/valid-3.c: Likewise.
	* gcc.dg/pch/warn-1.c: Likewise.
	* gcc.dg/pch/valid-4.c: Match a warning instead of an error.

From-SVN: r126145

6 files changed, 23 insertions, 7 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5367e3f..975939a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2007-06-30  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
+	PR testsuite/25241
+	* gcc.dg/pch/valid-1.c: Match each diagnostic with its own directive.
+	* gcc.dg/pch/valid-2.c: Likewise.
+	* gcc.dg/pch/valid-3.c: Likewise.
+	* gcc.dg/pch/warn-1.c: Likewise.
+	* gcc.dg/pch/valid-4.c: Match a warning instead of an error.
+	
+2007-06-30  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
 	PR c/4076
 	* gcc.dg/Wunused-function.c: New.
 	
diff --git a/gcc/testsuite/gcc.dg/pch/valid-1.c b/gcc/testsuite/gcc.dg/pch/valid-1.c
index ebfa85a..256ed8f 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-1.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-1.c
@@ -1,5 +1,7 @@
 /* { dg-options "-I. -Winvalid-pch -g" } */
 
-#include "valid-1.h"/* { dg-error "created with -gnone, but used with -g|No such file|they were invalid" } */
+#include "valid-1.h"/* { dg-warning "created with -gnone, but used with -g" } */
+/* { dg-error "No such file" "" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "" { target *-*-* } 3 } */
 
 int x;
diff --git a/gcc/testsuite/gcc.dg/pch/valid-2.c b/gcc/testsuite/gcc.dg/pch/valid-2.c
index 52a2e35..3ae1818 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-2.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-2.c
@@ -1,5 +1,6 @@
 /* { dg-options "-I. -Winvalid-pch -fexceptions" } */
 
-#include "valid-2.h"/* { dg-error "settings for -fexceptions do not match|No such file|they were invalid" } */
-
+#include "valid-2.h" /* { dg-warning "settings for -fexceptions do not match" } */
+/* { dg-error "No such file" "" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "" { target *-*-* } 3 } */
 int x;
diff --git a/gcc/testsuite/gcc.dg/pch/valid-3.c b/gcc/testsuite/gcc.dg/pch/valid-3.c
index 741a917..9ee3f7d 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-3.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-3.c
@@ -1,5 +1,6 @@
 /* { dg-options "-I. -Winvalid-pch -fno-unit-at-a-time" } */
 
-#include "valid-3.h"/* { dg-error "settings for -funit-at-a-time do not match|No such file|they were invalid" } */
-
+#include "valid-3.h"/* { dg-warning "settings for -funit-at-a-time do not match" } */
+/* { dg-error "No such file" "" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "" { target *-*-* } 3 } */
 int x;
diff --git a/gcc/testsuite/gcc.dg/pch/valid-4.c b/gcc/testsuite/gcc.dg/pch/valid-4.c
index 1249531..e4419b5 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-4.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-4.c
@@ -2,5 +2,5 @@
 
 #include "valid-4.h"
 
-char * x = "??/";  /* { dg-error "trigraph" } */
+char * x = "??/";  /* { dg-warning "trigraph" } */
 
diff --git a/gcc/testsuite/gcc.dg/pch/warn-1.c b/gcc/testsuite/gcc.dg/pch/warn-1.c
index 6e89581..c841bae 100644
--- a/gcc/testsuite/gcc.dg/pch/warn-1.c
+++ b/gcc/testsuite/gcc.dg/pch/warn-1.c
@@ -2,7 +2,10 @@
 
 #define DEFINED_VALUE 3
 
-#include "warn-1.h"/* { dg-error "not used because `DEFINED_VALUE' is defined|No such file|they were invalid" } */
+#include "warn-1.h"/* { dg-warning "not used because .DEFINED_VALUE. is defined" } */
+/* { dg-error "No such file" "" { target *-*-* } 5 } */
+/* { dg-error "they were invalid" "" { target *-*-* } 5 } */
+
 
 int main(void) 
 {