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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a397292287fcf072e443ec53c9cfe56d17262c7c..295538e968044db4aa1e3c62b1f27fd1fdab3122 100644 (file)
--- 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 d0475ba1de37d40864bf1824db028ddd5537e807..22ba245b698910689e33e7e143b62f922385cea7 100644 (file)
--- 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 256ed8f7ff758870e26460c05f305d63e7e191d9..1bf7d914467e25f0a34432c8aa329efe2282d6ae 100644 (file)
--- 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 3ae181880849c3092346484fcbe63092b3325355..4dbc4b2d37d91f34eb91aa9326fecdce5de0909e 100644 (file)
--- 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 9ee3f7da484721ca567c16ceca9c36d42d6f16cd..c7884f993a0ae695d33d34503aff0ce2ecd73231 100644 (file)
--- 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 c841bae4950675840dfb1c88a77951915fe73209..eaa9cafc39a282a385d6f0dadabdd0360445c2f9 100644 (file)
--- 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 d74739e6836f19cad3c3af7c7affe08cafbdb895..b12decceac6438d31ae0a6fd284345b905361d16 100644 (file)
--- 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"