* g++.dg/init/dtor1.C: Make it tougher.

From-SVN: r53061

2 files changed, 23 insertions, 3 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d24d0e4..3c7df3a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.dg/init/dtor1.C: Make it tougher.
+
 2002-05-01  Mark Mitchell  <mark@codesourcery.com>
 
 	* g++.dg/init/dtor1.C: New test.
diff --git a/gcc/testsuite/g++.dg/init/dtor1.C b/gcc/testsuite/g++.dg/init/dtor1.C
index 3a48bcd..6244338 100644
--- a/gcc/testsuite/g++.dg/init/dtor1.C
+++ b/gcc/testsuite/g++.dg/init/dtor1.C
@@ -2,7 +2,7 @@
 
 extern "C" void abort ();
 
-int d = 2;
+int d = 5;
 
 struct B
 {
@@ -11,10 +11,26 @@ struct B
   ~B () { if (d-- != x) abort (); }
 };
 
+struct C1 : public B {
+  C1 (int i) : B (i) {}
+};
+
+struct C2 : public B {
+  C2 (int i) : B (i) {}
+};
+
+struct D : public B {
+  D (int i) : B (i) {}
+};
+
+struct E : public B {
+  E (int i) : B (i) {}
+};
+
 struct A
-  : public B
+  : public C1, C2, virtual public D, virtual public E
 {
-  A () : B (0), x1(1), x2(2) {}
+  A () : D (0), E (1), C1 (2), C2 (3), x1(4), x2(5) {}
   B x1;
   B x2;
 };