[PATCH 01/14] gdb/testsuite/gdb.base/break.exp: split test_break_commands_clear

[Simon Marchi <simon.marchi@polymtl.ca>]

Change-Id: Ia58f90117d52fc419fc494836d9b4ed5d902fe9b
---
 gdb/testsuite/gdb.base/break.exp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index cb5831ac6103..c0756cdccc23 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -897,13 +897,21 @@ with_test_prefix "set line:file breakpoint via convenience variable" {
 	"non-integer convenience variable disallowed"
 }
 
-#
 # Test that commands can be cleared without error.
-#
 
-gdb_test "commands\nprint 232323\nend" ">end" "set some breakpoint commands"
-gdb_test "commands\nend" ">end" "clear breakpoint commands"
-# We verify that the commands were cleared by ensuring that the last
-# breakpoint's location ends the output -- if there were commands,
-# they would have been printed after the location.
-gdb_test "info break" "$srcfile:$line_actual" "verify that they were cleared"
+proc_with_prefix test_break_commands_clear {} {
+    clean_restart breako2
+
+    set line [gdb_get_line_number "set breakpoint 1 here"]
+    gdb_breakpoint $line
+
+    gdb_test "commands\nprint 232323\nend" ">end" "set some breakpoint commands"
+    gdb_test "commands\nend" ">end" "clear breakpoint commands"
+
+    # We verify that the commands were cleared by ensuring that the last
+    # breakpoint's location ends the output -- if there were commands,
+    # they would have been printed after the location.
+    gdb_test "info break" "$::srcfile:$::decimal" "verify that they were cleared"
+}
+
+test_break_commands_clear
-- 
2.38.1