+2008-10-03 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ PR gdb/2384:
+ * gdb.cp/gdb2384.exp: Extended to test more cases.
+ * gdb.cp/gdb2384.cc: Likewise.
+ * gdb.cp/gdb2384-base.h: Likewise.
+ * gdb.cp/gdb2384-base.cc: Likewise.
+
2008-10-02 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/maint.exp (maint print type): Remove printing
#include "gdb2384-base.h"
-class derived : public base
+class derived1 : public base
{
public:
- derived (int);
+ derived1 (int);
};
-derived::derived (int _x)
+derived1::derived1 (int _x)
: base (_x)
{
}
+class derived2 : public derived
+{
+ public:
+ derived2 (int);
+};
+
+derived2::derived2 (int _x)
+ : derived (_x)
+{
+}
+
int g;
int
main ()
{
- derived d (42);
- g = d.meth (); // set breakpoint here
+ derived1 d1 (42);
+ derived2 d2 (24);
+ g = d1.meth (); // set breakpoint here
+ g = d2.meth (); // set breakpoint here (second)
return 0;
}
gdb_load ${binfile}
gdb_load_shlibs ${sofile}
-set bp_location [gdb_get_line_number "set breakpoint here"]
-
-# Set a breakpoint with multiple locations.
-
-gdb_test "break $srcfile:$bp_location" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "set breakpoint"
-
-gdb_run_cmd
-gdb_expect {
- -re "Breakpoint \[0-9\]+,.*main \\(.*\\).*$gdb_prompt $" {
- pass "run to breakpoint"
- }
- -re "$gdb_prompt $" {
- fail "run to breakpoint"
- }
- timeout {
- fail "run to breakpoint (timeout)"
- }
+
+if ![runto_main] then {
+ perror "couldn't run to breakpoint"
+ return -1
}
-gdb_test "print d.meth ()" \
+gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
+gdb_continue_to_breakpoint "set breakpoint here"
+
+gdb_test "print d1.meth ()" \
".*42.*" \
- "print d.meth ()"
+ "print d1.meth ()"
# Now try again. gdb's without the fix will hopefully segv here
-gdb_run_cmd
-gdb_expect {
- -re "Breakpoint \[0-9\]+,.*main \\(.*\\).*$gdb_prompt $" {
- pass "run to breakpoint #2"
- }
- -re "$gdb_prompt $" {
- fail "run to breakpoint #2"
- }
- timeout {
- fail "run to breakpoint #2 (timeout)"
- }
-}
-
-gdb_test "print d.meth ()" \
+runto_main
+gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
+gdb_continue_to_breakpoint "set breakpoint here"
+gdb_test "print d1.meth ()" \
".*42.*" \
"gdb2384"
+
+# second case
+
+runto_main
+gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"]
+gdb_continue_to_breakpoint "set breakpoint here (second)"
+gdb_test "print d2.meth ()" \
+ ".*24.*" \
+ "print d2.meth()"
+
+runto_main
+gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"]
+gdb_continue_to_breakpoint "set breakpoint here (second)"
+gdb_test "print d2.meth ()" \
+ ".*24.*" \
+ "gdb2384 (second)"
+