using16.C: Merge dg-errors with common line.

	* g++.dg/lookup/using16.C: Merge dg-errors with common line.
	* g++.dg/lookup/using17.C: Merge dg-errors with common line.

From-SVN: r126218

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4eec59e89d5e22a01391d8372fbd51849e18df65..40a309f1858f5a612076de00bb86657aedd36391 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-02  Ollie Wild  <aaw@google.com>
+
+       * g++.dg/lookup/using16.C: Merge dg-errors with common line.
+       * g++.dg/lookup/using17.C: Merge dg-errors with common line.
+
 2007-07-02  Richard Sandiford  <richard@codesourcery.com>
 
        * gcc.target/mips/save-restore-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/lookup/using16.C b/gcc/testsuite/g++.dg/lookup/using16.C
index e373f3778977b7d3112186774333b5119c5b7eda..ff6a80ee93f44457b57c798f5d41f1179ff79d65 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/using16.C
+++ b/gcc/testsuite/g++.dg/lookup/using16.C
@@ -15,5 +15,4 @@ using namespace M;
 using namespace N;
 
 struct ::S s; // { dg-bogus "ambiguous.*ambiguous" "duplicate error" }
-// { dg-error "reference to 'S' is ambiguous" "" { target *-*-* } 17 }}
-// { dg-error "invalid type" "" { target *-*-* } 17 }
+// { dg-error "reference to 'S' is ambiguous|invalid type" "" { target *-*-* } 17 }}

diff --git a/gcc/testsuite/g++.dg/lookup/using17.C b/gcc/testsuite/g++.dg/lookup/using17.C
index 59888852c42af45d26364d8cee3f67c4e13ff697..b98b21a0cda135147638718966bdb1eb93a5e51b 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/using17.C
+++ b/gcc/testsuite/g++.dg/lookup/using17.C
@@ -11,5 +11,4 @@ struct S {}; // { dg-error "candidates are: struct S" "candidate 1" }
 
 using namespace M;
 
-struct S s; // { dg-error "reference to 'S' is ambiguous" "" }
-// { dg-error "invalid type in declaration" "" { target *-*-* } 14 }
+struct S s; // { dg-error "reference to 'S' is ambiguous|invalid type in declaration" "" }