2000-12-09 Michael Chastain <chastain@redhat.com>

	* gdb.base/break.exp (test_clear_command): Use a marker function
	rather than 'main' for the test function.  Also move this
	test to an execution point where the marker function names are
	guaranteed to be bound to functions.  (Executing tests after a
	'finish' from main runs into name conflicts with local names
	in __libc_start_main).

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 19bcf2c..3ff356d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-09  Michael Chastain  <chastain@redhat.com>
+
+       * gdb.base/break.exp (test_clear_command): Use a marker function
+       rather than 'main' for the test function.  Also move this
+       test to an execution point where the marker function names are
+       guaranteed to be bound to functions.  (Executing tests after a
+       'finish' from main runs into name conflicts with local names
+       in __libc_start_main).
+
 2000-12-07  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
        * gdb.base/finish.exp: New test for gdb's "finish" command.

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 7e2bbac..9473324 100644 (file)
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -520,6 +520,15 @@ gdb_expect {
   timeout {fail "(timeout) clear current line has no breakpoint disallowed"}
 }
 
+# Verify that we can set and clear multiple breakpoints.
+#
+# We don't test that it deletes the correct breakpoints.  We do at
+# least test that it deletes more than one breakpoint.
+#
+gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #1"
+gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #2"
+gdb_test "clear marker3" {Deleted breakpoints [0-9]+ [0-9]+.*}
+
 # Verify that a breakpoint can be set via a convenience variable.
 #
 send_gdb "set \$foo=81\n"
@@ -706,15 +715,6 @@ if [istarget "hppa*-*-hpux*"] then {
 #********
 
 
-proc test_clear_command {} {
-    gdb_test "break main" "Breakpoint.*at.*" "break main #1"
-    gdb_test "break main" "Breakpoint.*at.*" "break main #2"
-
-    # We don't test that it deletes the correct breakpoints.  We do at
-    # least test that it deletes more than one breakpoint.
-    gdb_test "clear main" {Deleted breakpoints [0-9]+ [0-9]+.*}
-}
-
 #
 # Test "next" over recursive function call.
 #
@@ -802,7 +802,6 @@ proc test_next_with_recursion {} {
    gdb_stop_suppressing_tests;
 }
 
-test_clear_command
 test_next_with_recursion