2001-02-19 John Moore <jmoore@redhat.com>

	* gdb.base/commands.exp (infrun_breakpoint_command_test):
	Converted HPUX fix for non-expected items following multiple
	step commands into general solution for all platforms.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4f0d324..1f63f18 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-19  John Moore  <jmoore@redhat.com>
+
+       * gdb.base/commands.exp (infrun_breakpoint_command_test):
+       Converted HPUX fix for non-expected items following multiple
+       step commands into general solution for all platforms.
+
 2001-02-18  Michael Chastain  <chastain@redhat.com>
 
        * gdb.c++/classes.exp (do_tests): Change runto statements

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 09802bd..35de1fb 100644 (file)
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -172,6 +172,11 @@ proc if_while_breakpoint_command_test {} {
 }
 
 # Test that we can run the inferior from breakpoint commands.
+#
+# The expected behavior is that all commands after the first "step"
+# shall be ignored.  See the gdb manual, "Break Commands",
+# subsection "Breakpoint command lists".
+
 proc infrun_breakpoint_command_test {} {
     if [target_info exists noargs] { 
         verbose "Skipping infrun_breakpoint_command_test because of noargs."
@@ -199,29 +204,12 @@ proc infrun_breakpoint_command_test {} {
            fail "(timeout or eof) commands in infrun_breakpoint_command_test"
        }
     }
-    gdb_test "step\nstep\nstep\nstep\nbt\nend" "" \
+    gdb_test "step\nstep\nstep\nstep\nend" "" \
        "commands in infrun_breakpoint_command_test #2"
 
-    if { [istarget "hppa*-hp-hpux*"] } {
        gdb_test "continue" \
                "Continuing.*.*.*Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*\[0-9\]*\[      \]*if \\(value > 1\\) \{.*\[0-9\]*\[      \]*value \\*= factorial \\(value - 1\\);.*" \
                "continue in infrun_breakpoint_command_test"
-    } else {
-       gdb_test "continue" \
-               "Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*
-\[0-9\]*\[     \]*if \\(value > 1\\) \{.*
-\[0-9\]*\[     \]*value \\*= factorial \\(value - 1\\);.*
-factorial \\(value=4\\) at.*\[0-9\]*\[         \]*if \\(value > 1\\) \{.*
-\[0-9\]*\[     \]*value \\*= factorial \\(value - 1\\);.*
-factorial \\(value=3\\) at .*
-\[0-9\]*\[     \]*if \\(value > 1\\) \{.*
-#0  factorial \\(value=3\\).*
-#1  \[0-9a-fx\]* in factorial \\(value=4\\).*
-#2  \[0-9a-fx\]* in factorial \\(value=5\\).*
-#3  \[0-9a-fx\]* in factorial \\(value=6\\).*
-#4  \[0-9a-fx\]* in main \\(.*\\).*" \
-               "continue in infrun_breakpoint_command_test";
-    }
 
     gdb_stop_suppressing_tests;
 }