This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] remove some calls to gdb_step_for_stub
- From: dje at google dot com (Doug Evans)
- To: gdb-patches at sourceware dot org
- Date: Sat, 3 Dec 2011 17:41:39 -0800 (PST)
- Subject: [patch] remove some calls to gdb_step_for_stub
These .exp files have errant calls to gdb_step_for_stub.
[E.g. the test already early-exists if the target is remote
or skip_shlib_tests (which precludes targets that use stubs AFAICT),
and there's no stub call to step out of.]
More cleanup is still needed, this is just another step.
I will check this in in a few days if there are no objections.
2011-12-03 Doug Evans <dje@google.com>
* gdb.base/annota1.exp: Remove call to gdb_step_for_stub.
* gdb.base/annota3.exp: Ditto.
* gdb.base/pending.exp: Ditto.
* gdb.base/unload.exp: Ditto.
* gdb.base/watchpoint-solib.exp: Ditto.
* gdb.cp/annota2.exp: Ditto.
* gdb.cp/annota3.exp: Ditto.
* gdb.mi/mi-pending.exp: Ditto.
Index: gdb.base/annota1.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v
retrieving revision 1.42
diff -u -p -r1.42 annota1.exp
--- gdb.base/annota1.exp 8 Sep 2011 14:56:34 -0000 1.42
+++ gdb.base/annota1.exp 4 Dec 2011 01:24:55 -0000
@@ -50,10 +50,6 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
#
# the line at which break main will put the breakpoint
#
Index: gdb.base/annota3.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota3.exp,v
retrieving revision 1.25
diff -u -p -r1.25 annota3.exp
--- gdb.base/annota3.exp 8 Sep 2011 14:56:34 -0000 1.25
+++ gdb.base/annota3.exp 4 Dec 2011 01:24:55 -0000
@@ -50,10 +50,6 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
#
# the line at which break main will put the breakpoint
#
Index: gdb.base/pending.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/pending.exp,v
retrieving revision 1.22
diff -u -p -r1.22 pending.exp
--- gdb.base/pending.exp 1 Jan 2011 15:33:42 -0000 1.22
+++ gdb.base/pending.exp 4 Dec 2011 01:24:55 -0000
@@ -85,9 +85,6 @@ gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
gdb_load_shlibs $lib_sl
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
#
# Test setting, querying, and modifying pending breakpoints
#
Index: gdb.base/unload.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/unload.exp,v
retrieving revision 1.21
diff -u -p -r1.21 unload.exp
--- gdb.base/unload.exp 1 Jan 2011 15:33:43 -0000 1.21
+++ gdb.base/unload.exp 4 Dec 2011 01:24:55 -0000
@@ -69,10 +69,6 @@ gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
gdb_load_shlibs $lib_sl $lib_sl2
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
#
# Test setting a breakpoint in a dynamically loaded library which is
# manually loaded and unloaded
Index: gdb.base/watchpoint-solib.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/watchpoint-solib.exp,v
retrieving revision 1.9
diff -u -p -r1.9 watchpoint-solib.exp
--- gdb.base/watchpoint-solib.exp 1 Jan 2011 15:33:43 -0000 1.9
+++ gdb.base/watchpoint-solib.exp 4 Dec 2011 01:24:55 -0000
@@ -58,10 +58,6 @@ gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
gdb_load_shlibs $lib_sl
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
runto_main
# Disable hardware watchpoints if necessary.
Index: gdb.cp/annota2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/annota2.exp,v
retrieving revision 1.23
diff -u -p -r1.23 annota2.exp
--- gdb.cp/annota2.exp 9 Mar 2011 14:17:05 -0000 1.23
+++ gdb.cp/annota2.exp 4 Dec 2011 01:24:55 -0000
@@ -51,10 +51,6 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
#
# line number where we need to stop in main
#
Index: gdb.cp/annota3.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/annota3.exp,v
retrieving revision 1.21
diff -u -p -r1.21 annota3.exp
--- gdb.cp/annota3.exp 9 Mar 2011 14:17:05 -0000 1.21
+++ gdb.cp/annota3.exp 4 Dec 2011 01:24:55 -0000
@@ -51,10 +51,6 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
#
# line number where we need to stop in main
#
Index: gdb.mi/mi-pending.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-pending.exp,v
retrieving revision 1.11
diff -u -p -r1.11 mi-pending.exp
--- gdb.mi/mi-pending.exp 1 Jan 2011 15:33:47 -0000 1.11
+++ gdb.mi/mi-pending.exp 4 Dec 2011 01:24:55 -0000
@@ -56,10 +56,6 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${binfile}
mi_load_shlibs $lib_sl
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
-}
-
# Set pending breakpoint via MI
mi_gdb_test "-break-insert -f pendfunc1" \
".*\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"<PENDING>\",pending=\"pendfunc1\",times=\"0\",original-location=\"pendfunc1\"\}"\