2004-03-09 Michael Chastain <mec.gnu@mindspring.com>

	From Corinna Vinschen with modifications.
	* gdb.cp/classes.cc (enums1): Add a line to extend scope of
	local variable obj_with_enum.
	* gdb.cp/classes.exp (test_enums): Remove TODO note about FAIL
	results with obj_with_enum.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 82469e822f3b65f61f3954b86e1655181865171f..a1d5f1278e1d0760ff9d774dcf1dc013648b4b8f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-09  Michael Chastain  <mec.gnu@mindspring.com>
+
+       From Corinna Vinschen with modifications.
+       * gdb.cp/classes.cc (enums1): Add a line to extend scope of
+       local variable obj_with_enum.
+       * gdb.cp/classes.exp (test_enums): Remove TODO note about FAIL
+       results with obj_with_enum.
+
 2004-03-09  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.cp/classes.cc: New file, copied from misc.cc.

diff --git a/gdb/testsuite/gdb.cp/classes.cc b/gdb/testsuite/gdb.cp/classes.cc
index 7d69ed225ae523c7c1586632231c25edbdc93751..d09f38fc36db32c346f62a8f8de73cd6de4afa3a 100644 (file)
--- a/gdb/testsuite/gdb.cp/classes.cc
+++ b/gdb/testsuite/gdb.cp/classes.cc
@@ -1,6 +1,6 @@
 /* This testcase is part of GDB, the GNU debugger.
 
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2004
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -453,6 +453,7 @@ void enums1 ()
   obj_with_enum.x = 0;
   enums2 ();
   obj_with_enum.priv_enum = ClassWithEnum::green;
+  obj_with_enum.x = 1;
 }
 
 class ClassParam {

diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 27abe0d54a5f8749d36fe38053d4f2fee64fae85..0b723e591f68fb3820a0a69674dd8b5ef02ea190 100644 (file)
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -633,11 +633,6 @@ proc test_enums {} {
 
     gdb_test "next" ""
 
-    # TODO: with gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2,
-    # gdb says that obj_with_enum is out of scope here and the
-    # tests after this FAIL.  This needs investigation.
-    # -- chastain 2003-12-30
-
     # print the object again
 
     gdb_test "print obj_with_enum" \