rpms/gdb/devel gdb-6.3-inheritancetest-20050726.patch, NONE, 1.1 gdb.spec, 1.154, 1.155

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 26 21:29:08 UTC 2005


Author: jjohnstn

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28993

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-inheritancetest-20050726.patch 
Log Message:

* Tue Jul 26 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.57
- Bump up release number.

* Tue Jul 26 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.54
- Add testcase to verify printing of inherited members
- Bugzilla 146835




gdb-6.3-inheritancetest-20050726.patch:
 b146835.cc  |   32 ++++++++++++++++++++++++++++++++
 b146835.exp |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 b146835.h   |   36 ++++++++++++++++++++++++++++++++++++
 b146835b.cc |   11 +++++++++++
 4 files changed, 134 insertions(+)

--- NEW FILE gdb-6.3-inheritancetest-20050726.patch ---
2005-07-26  Jeff Johnston  <jjohnstn at redhat.com>

	* gdb.cp/b146835.exp: New testcase.
	* gdb.cp/b146835.cc: Ditto.
	* gdb.cp/b146835b.cc: Ditto.
	* gdb.cp/b146835.h: Ditto.

--- gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc.fix3	2005-07-26 16:47:12.000000000 -0400
+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc	2005-07-26 16:53:31.000000000 -0400
@@ -0,0 +1,11 @@
+#include "b146835.h"
+
+C::C() { d = 0; x = 3; }
+
+int C::z (char *s) { return 0; }
+
+C::~C() {}
+
+void A::funcD (class E *e, class D *d) {}
+void A::funcE (E *e, D *d) {}
+void A::funcF (unsigned long x, D *d) {}
--- gdb-6.3/gdb/testsuite/gdb.cp/b146835.cc.fix3	2005-07-26 16:47:20.000000000 -0400
+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.cc	2005-07-26 16:46:50.000000000 -0400
@@ -0,0 +1,32 @@
+#include "b146835.h"
+#include <iostream>
+
+class F : public C {
+
+protected:
+
+   virtual void funcA (unsigned long a, B *b);
+   virtual void funcB (E *e);
+   virtual void funcC (unsigned long x, bool y);
+
+   char *s1, *s2;
+   bool b1;
+   int k;
+
+public:
+   void foo() {
+       std::cout << "foo" << std::endl;
+   }
+};
+
+
+void F::funcA (unsigned long a, B *b) {}
+void F::funcB (E *e) {}
+void F::funcC (unsigned long x, bool y) {}
+
+int  main()
+{
+   F f;
+   f.foo();
+}
+
--- gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp.fix3	2005-07-26 16:47:26.000000000 -0400
+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp	2005-07-26 16:46:50.000000000 -0400
@@ -0,0 +1,55 @@
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2005 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Check that GDB can properly print an inherited member variable
+# (Bugzilla 146835)
+
+if $tracelevel {
+    strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile "b146835"
+set srcfile ${testfile}.cc
+set srcfile2 ${testfile}b.cc
+set binfile ${objdir}/${subdir}/${testfile}
+if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable {debug c++}] != "" } {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+#
+# Run to `main' where we begin our tests.
+#
+
+if ![runto_main] then {
+    gdb_suppress_tests
+}
+
+gdb_test "break 'F::foo()'" ""
+gdb_continue_to_breakpoint "First line foo"
+
+# Verify that we can access the inherited member d
+gdb_test "p d" ".*(struct D \*.).*0x0" "Verify inherited member d accessible"
+
--- gdb-6.3/gdb/testsuite/gdb.cp/b146835.h.fix3	2005-07-26 16:47:36.000000000 -0400
+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.h	2005-07-26 16:53:18.000000000 -0400
@@ -0,0 +1,36 @@
+
+class A {
+
+protected:
+
+   virtual void funcA (unsigned long a, class B *b) = 0;
+   virtual void funcB (class E *e) = 0;
+   virtual void funcC (unsigned long x, bool y) = 0;
+
+   void funcD (class E *e, class D* d);
+   virtual void funcE (E *e, D *d);
+   virtual void funcF (unsigned long x, D *d);
+};
+
+
+class C : public A {
+
+protected:
+
+   int x;
+   class K *k;
+   class H *h;
+
+   D *d;
+
+   class W *w;
+   class N *n;
+   class L *l;
+   unsigned long *r;
+
+public:
+
+   C();
+   int z (char *s);
+   virtual ~C();
+};


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gdb.spec	25 Jul 2005 22:43:34 -0000	1.154
+++ gdb.spec	26 Jul 2005 21:29:05 -0000	1.155
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.53
+Release: 1.57
 
 License: GPL
 Group: Development/Debuggers
@@ -237,6 +237,9 @@
 # Fix ia64 info frame bug
 Patch162: gdb-6.3-ia64-info-frame-fix-20050725.patch
 
+# Verify printing of inherited members test
+Patch163: gdb-6.3-inheritancetest-20050726.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -330,7 +333,7 @@
 %patch159 -p1
 %patch160 -p1
 %patch161 -p1
-%patch162 -p1
+%patch163 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -499,6 +502,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Jul 26 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.57
+- Bump up release number.
+                                                                                
+* Tue Jul 26 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.54
+- Add testcase to verify printing of inherited members
+- Bugzilla 146835
+                                                                                
 * Mon Jul 25 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.53
 - Bump up release number.
                                                                                 




More information about the fedora-cvs-commits mailing list