diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/cv_func.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/offsetof3.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/error11.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tc1/dr108.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/local4.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/nontype6.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/deprecated.C | 10 |
8 files changed, 20 insertions, 12 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 647f155..6d39769 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2005-03-15 Joseph S. Myers <joseph@codesourcery.com> + + * g++.dg/other/cv_func.C, g++.dg/other/offsetof3.C, + g++.dg/parse/error11.C, g++.dg/tc1/dr108.C, + g++.dg/template/local4.C, g++.dg/template/nontype6.C, + g++.dg/warn/deprecated.C: Ensure uniqueness of test assertion + names. + 2005-03-14 Geoffrey Keating <geoffk@apple.com> * gcc.dg/cpp/normalize-1.c: New. diff --git a/gcc/testsuite/g++.dg/other/cv_func.C b/gcc/testsuite/g++.dg/other/cv_func.C index 6c9ab1b..4f10382 100644 --- a/gcc/testsuite/g++.dg/other/cv_func.C +++ b/gcc/testsuite/g++.dg/other/cv_func.C @@ -4,7 +4,7 @@ typedef int FIC(int) const; typedef int FI(int); FIC f; // { dg-error "qualified" } -// { dg-error "ignoring" "" { target *-*-* } 6 } +// { dg-error "ignoring" "ignoring" { target *-*-* } 6 } struct S { FIC f; // OK @@ -15,7 +15,7 @@ struct S { }; FIC S::*pm = &S::f; const FI S::*pm2 = &S::f; // { dg-error "qualifier" } -// { dg-error "cannot convert" "" { target *-*-* } 17 } +// { dg-error "cannot convert" "cannot convert" { target *-*-* } 17 } const FIC S::*pm3 = &S::f; // { dg-error "qualifier" } int S::f(int) const diff --git a/gcc/testsuite/g++.dg/other/offsetof3.C b/gcc/testsuite/g++.dg/other/offsetof3.C index 7106a3f..1e83af9 100644 --- a/gcc/testsuite/g++.dg/other/offsetof3.C +++ b/gcc/testsuite/g++.dg/other/offsetof3.C @@ -13,4 +13,4 @@ typedef X* pX; typedef __SIZE_TYPE__ size_t; size_t yoff = size_t(&(pX(0)->y)); /* { dg-warning "invalid access" "" } */ -/* { dg-warning "macro was used incorrectly" "" { target *-*-* } 15 } */ +/* { dg-warning "macro was used incorrectly" "macro" { target *-*-* } 15 } */ diff --git a/gcc/testsuite/g++.dg/parse/error11.C b/gcc/testsuite/g++.dg/parse/error11.C index 6b3deec1..0a8e2e4 100644 --- a/gcc/testsuite/g++.dg/parse/error11.C +++ b/gcc/testsuite/g++.dg/parse/error11.C @@ -50,4 +50,4 @@ template struct Foo<::B>; // { dg-error "cannot begin|alternate spelling" } // On the first error message, an additional note about the use of // -fpermissive should be present -// { dg-error "-fpermissive" "" { target *-*-* } 18 } +// { dg-error "-fpermissive" "-fpermissive" { target *-*-* } 18 } diff --git a/gcc/testsuite/g++.dg/tc1/dr108.C b/gcc/testsuite/g++.dg/tc1/dr108.C index f7848ec..6b567a9 100644 --- a/gcc/testsuite/g++.dg/tc1/dr108.C +++ b/gcc/testsuite/g++.dg/tc1/dr108.C @@ -12,4 +12,4 @@ template <class T> struct S { }; // Additional notes on the same line are allowed -// { dg-error "" "" { target *-*-* } 10 } +// { dg-error "" "additional" { target *-*-* } 10 } diff --git a/gcc/testsuite/g++.dg/template/local4.C b/gcc/testsuite/g++.dg/template/local4.C index 748810b..20f8bf2 100644 --- a/gcc/testsuite/g++.dg/template/local4.C +++ b/gcc/testsuite/g++.dg/template/local4.C @@ -6,6 +6,6 @@ int main () { struct S {}; // We do not simply use "local|match" on line 10 because we want to // make sure that "local" appears. - // { dg-error "local" "" { target *-*-* } 10 } + // { dg-error "local" "local" { target *-*-* } 10 } foo<S> (); // { dg-error "trying|match" } } diff --git a/gcc/testsuite/g++.dg/template/nontype6.C b/gcc/testsuite/g++.dg/template/nontype6.C index 43470cc..298ce82 100644 --- a/gcc/testsuite/g++.dg/template/nontype6.C +++ b/gcc/testsuite/g++.dg/template/nontype6.C @@ -13,7 +13,7 @@ template <class T> void func(void) { (void)A<T>::type(); // { dg-error "if a type is meant" } -// { dg-error "parsed as a non-type" "" { target *-*-* } 15 } +// { dg-error "parsed as a non-type" "non-type" { target *-*-* } 15 } } template void func<float>(void); // { dg-error "instantiated from here" } diff --git a/gcc/testsuite/g++.dg/warn/deprecated.C b/gcc/testsuite/g++.dg/warn/deprecated.C index 21b901a..59dc3d6 100644 --- a/gcc/testsuite/g++.dg/warn/deprecated.C +++ b/gcc/testsuite/g++.dg/warn/deprecated.C @@ -53,10 +53,10 @@ int func1() int (*pf)() = f1; /* { dg-warning "'f1' is deprecated" "" } */ z = w + x + y + g1 + g2 + g3; /* { dg-warning "'x' is deprecated" "" } */ - /* { dg-warning "'y' is deprecated" "" { target *-*-* } 55 } */ - /* { dg-warning "'g2' is deprecated" "" { target *-*-* } 55 } */ - /* { dg-warning "'g3' is deprecated" "" { target *-*-* } 55 } */ - return f1(); /* { dg-warning "'f1' is deprecated" "" } */ + /* { dg-warning "'y' is deprecated" "y" { target *-*-* } 55 } */ + /* { dg-warning "'g2' is deprecated" "g2" { target *-*-* } 55 } */ + /* { dg-warning "'g3' is deprecated" "g3" { target *-*-* } 55 } */ + return f1(); /* { dg-warning "'f1' is deprecated" "f1" } */ } int func2(S1 *p) @@ -71,7 +71,7 @@ int func2(S1 *p) p->u1.field5 = g1 + p->field7; p->u2.field9; /* { dg-warning "'u2' is deprecated" "" } */ return p->u1.field6 + p->field8; /* { dg-warning "'field6' is deprecated" "" } */ - /* { dg-warning "'field8' is deprecated" "" { target *-*-* } 73 } */ + /* { dg-warning "'field8' is deprecated" "field8" { target *-*-* } 73 } */ } struct SS1 { |