cv_func.C, [...]: Ensure uniqueness of test assertion names.

	* 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.

From-SVN: r96463

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 647f1554abe4550baa4e8be2becd1c22bba621b7..6d39769c8d4f1f77e56515178651b77d72183c69 100644 (file)
--- 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 6c9ab1bc2f7db31ada62e1331dfc925ad8d0e625..4f103824d9394f8bbfdd7ffa211b48d781d47353 100644 (file)
--- 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 7106a3f01ad7eeb789a8f3ebd9abb82e7f58e7ba..1e83af980718ed7eaf4d31f711a0a33c21975c91 100644 (file)
--- 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 6b3deec178abbd86f7db0a0daf0e5fa657e51a69..0a8e2e4fc3d64b53ae589d11d4ff6071b008c659 100644 (file)
--- 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 f7848ec74b625578ada44a151623495bb59d1ca0..6b567a9fad551cb55a245c726559b52ba3f1c29a 100644 (file)
--- 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 748810b409ecb9713685d04d5f5080e4c8ef336a..20f8bf294417456543ef325976c5ae380373a425 100644 (file)
--- 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 43470ccdb1df811477ae9a79316800a56e26cc79..298ce82591c98cfaa9eda13a45bf86fbf33d866a 100644 (file)
--- 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 21b901af4f592c55e1eceabcfe1031773a952f19..59dc3d67257c9c722992a06078b0378c5ccbf73b 100644 (file)
--- 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 {