From d49343266bbe24e86d772f2cf1513012e1fae90c Mon Sep 17 00:00:00 2001 From: Ollie Wild Date: Mon, 2 Jul 2007 17:28:53 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/lookup/using16.C | 3 +-- gcc/testsuite/g++.dg/lookup/using17.C | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4eec59e89d5..40a309f1858 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-02 Ollie Wild + + * 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 * 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 e373f377897..ff6a80ee93f 100644 --- 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 59888852c42..b98b21a0cda 100644 --- 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" "" } -- 2.30.2