re PR testsuite/20771 (Duplicate PCH test names)

	PR testsuite/20771
	* lib/dg-pch.exp: Move a flag in arguments to dg-test to differentiate
	compile results for pch test lines in gcc.sum.
	* gcc.dg/pch/counter-2.c: Add comments to dg-error directives to
	make them unique in gcc.sum.
	* gcc.dg/pch/valid-1.c: Ditto.
	* gcc.dg/pch/valid-2.c: Ditto.
	* gcc.dg/pch/valid-3.c: Ditto.
	* gcc.dg/pch/warn-1.c: Same for dg-warning.

From-SVN: r135696

7 files changed, 23 insertions, 11 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a397292..295538e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-20  Janis Johnson  <janis187@us.ibm.com>
+
+	PR testsuite/20771
+	* lib/dg-pch.exp: Move a flag in arguments to dg-test to differentiate
+	compile results for pch test lines in gcc.sum.
+	* gcc.dg/pch/counter-2.c: Add comments to dg-error directives to
+	make them unique in gcc.sum.
+	* gcc.dg/pch/valid-1.c: Ditto.
+	* gcc.dg/pch/valid-2.c: Ditto.
+	* gcc.dg/pch/valid-3.c: Ditto.
+	* gcc.dg/pch/warn-1.c: Same for dg-warning.
+
 2008-05-20  Andy Hutchinson  <hutchinsonandy@aim.com>
 
 	* gcc.dg/array-quals-1.c: xfail read only section
diff --git a/gcc/testsuite/gcc.dg/pch/counter-2.c b/gcc/testsuite/gcc.dg/pch/counter-2.c
index d0475ba..22ba245 100644
--- a/gcc/testsuite/gcc.dg/pch/counter-2.c
+++ b/gcc/testsuite/gcc.dg/pch/counter-2.c
@@ -8,8 +8,8 @@
 #endif
 
 #include "counter-2.h" /* { dg-warning "not used because `__COUNTER__' is invalid" } */
-/* { dg-error "counter-2.h: No such file or directory" "" { target *-*-* } 10 } */
-/* { dg-error "one or more PCH files were found, but they were invalid" "" { target *-*-* } 10 } */
+/* { dg-error "counter-2.h: No such file or directory" "no such file" { target *-*-* } 10 } */
+/* { dg-error "one or more PCH files were found, but they were invalid" "invalid files" { target *-*-* } 10 } */
 
 int main(void) 
 {
diff --git a/gcc/testsuite/gcc.dg/pch/valid-1.c b/gcc/testsuite/gcc.dg/pch/valid-1.c
index 256ed8f..1bf7d91 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-1.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-1.c
@@ -1,7 +1,7 @@
 /* { dg-options "-I. -Winvalid-pch -g" } */
 
 #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 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "invalid files" { 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 3ae1818..4dbc4b2 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-2.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-2.c
@@ -1,6 +1,6 @@
 /* { dg-options "-I. -Winvalid-pch -fexceptions" } */
 
 #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 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "invalid files" { 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 9ee3f7d..c7884f9 100644
--- a/gcc/testsuite/gcc.dg/pch/valid-3.c
+++ b/gcc/testsuite/gcc.dg/pch/valid-3.c
@@ -1,6 +1,6 @@
 /* { dg-options "-I. -Winvalid-pch -fno-unit-at-a-time" } */
 
 #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 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 3 } */
+/* { dg-error "they were invalid" "invalid files" { target *-*-* } 3 } */
 int x;
diff --git a/gcc/testsuite/gcc.dg/pch/warn-1.c b/gcc/testsuite/gcc.dg/pch/warn-1.c
index c841bae..eaa9caf 100644
--- a/gcc/testsuite/gcc.dg/pch/warn-1.c
+++ b/gcc/testsuite/gcc.dg/pch/warn-1.c
@@ -3,8 +3,8 @@
 #define DEFINED_VALUE 3
 
 #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 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 5 } */
+/* { dg-error "they were invalid" "invalid files" { target *-*-* } 5 } */
 
 
 int main(void) 
diff --git a/gcc/testsuite/lib/dg-pch.exp b/gcc/testsuite/lib/dg-pch.exp
index d74739e..b12decc 100644
--- a/gcc/testsuite/lib/dg-pch.exp
+++ b/gcc/testsuite/lib/dg-pch.exp
@@ -48,7 +48,7 @@ proc dg-pch { subdir test options suffix } {
 	    # Ensure that the PCH file is used, not the original header.
 	    file_on_host delete "$bname$suffix"
 
-	    dg-test -keep-output $test $flags "-I."
+	    dg-test -keep-output $test "$flags -I." ""
 	    file_on_host delete "$bname$suffix.gch"
 	    if { [ file_on_host exists "$bname.s" ] } {
 		remote_upload host "$bname.s" "$bname.s-gch"