[PATCH 1/7] gdb/testsuite: remove unused arguments to gdb_breakpoint

[simon.marchi@polymtl.ca]

From: Simon Marchi <simon.marchi@polymtl.ca>

These arguments don't actually do anything, remove them.

Change-Id: Ifd6a18d3effc521ba410fd40280a197d37661b12
---
 gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp      |  4 +---
 gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp        |  6 ++----
 gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp | 12 ++++--------
 gdb/testsuite/gdb.base/gcore-memory-usage.exp       |  2 +-
 gdb/testsuite/gdb.base/valgrind-disp-step.exp       |  2 +-
 gdb/testsuite/gdb.base/watchpoint-unaligned.exp     |  5 ++---
 gdb/testsuite/gdb.threads/fork-thread-pending.exp   |  2 +-
 gdb/testsuite/gdb.threads/multiple-step-overs.exp   |  2 +-
 gdb/testsuite/gdb.threads/thread-bp-deleted.exp     |  3 +--
 9 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
index 269e32cecc74..27a13b346e8a 100644
--- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
@@ -29,9 +29,7 @@ if {![runto_main]} {
     return -1
 }
 
-gdb_breakpoint "[gdb_get_line_number "ldxr"]" \
-  "Breakpoint $decimal at $hex" \
-  "Set the breakpoint at the start of the sequence"
+gdb_breakpoint "[gdb_get_line_number "ldxr"]"
 
 gdb_test "continue" "Continuing.*Breakpoint $decimal.*" \
   "Continue until breakpoint"
diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
index c020df807f44..80410fe6f7c3 100644
--- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
@@ -39,12 +39,10 @@ proc do_test { displaced } {
     gdb_test_no_output "set displaced-stepping $displaced"
 
     set bp1 [gdb_get_line_number "lwarx"]
-    gdb_breakpoint "$bp1" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the lwarx/stwcx sequence"
+    gdb_breakpoint "$bp1"
 
     set bp2 [gdb_get_line_number "ldarx"]
-    gdb_breakpoint "$bp2" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the ldarx/stdcx sequence"
+    gdb_breakpoint "$bp2"
 
     gdb_test continue "Continuing.*Breakpoint $decimal.*" \
 	"continue until lwarx/stwcx start breakpoint"
diff --git a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
index 482dbb4d04fd..0772eda0a0a8 100644
--- a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
@@ -43,8 +43,7 @@ proc do_test { displaced } {
 
     gdb_test_no_output "set displaced-stepping $displaced"
 
-    gdb_breakpoint "test_atomic_sequences" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the test function"
+    gdb_breakpoint "test_atomic_sequences"
 
     gdb_test_multiple "continue" "Continue until lbarx/stbcx start breakpoint" {
       -re "$inferior_exited_re with code 01.\[\r\n\]+$gdb_prompt $" {
@@ -57,16 +56,13 @@ proc do_test { displaced } {
     }
 
     set bp1 [gdb_get_line_number "lbarx" "$srcfile2"]
-    gdb_breakpoint "$bp1" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the lbarx/stbcx sequence"
+    gdb_breakpoint "$bp1"
 
     set bp2 [gdb_get_line_number "lharx" "$srcfile2"]
-    gdb_breakpoint "$bp2" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the lharx/sthcx sequence"
+    gdb_breakpoint "$bp2"
 
     set bp3 [gdb_get_line_number "lqarx" "$srcfile2"]
-    gdb_breakpoint "$bp3" "Breakpoint $decimal at $hex" \
-	"set the breakpoint at the start of the lqarx/stqcx sequence"
+    gdb_breakpoint "$bp3"
 
     gdb_test continue "Continuing.*Breakpoint $decimal.*" \
 	"continue until lbarx/stbcx start breakpoint"
diff --git a/gdb/testsuite/gdb.base/gcore-memory-usage.exp b/gdb/testsuite/gdb.base/gcore-memory-usage.exp
index fc57d1604e29..d9c8dd0bffc3 100644
--- a/gdb/testsuite/gdb.base/gcore-memory-usage.exp
+++ b/gdb/testsuite/gdb.base/gcore-memory-usage.exp
@@ -61,7 +61,7 @@ proc run_test {megs max_mem} {
 
 	gdb_test "attach $inferior_pid" "Attaching to.*" attach
 	set line [gdb_get_line_number "TAG: BREAK HERE" $::testfile.c]
-	gdb_breakpoint "${::srcfile}:$line" "break at to known line"
+	gdb_breakpoint "${::srcfile}:$line"
 	gdb_continue_to_breakpoint "continue to known line"
 
 	# Get the important info.
diff --git a/gdb/testsuite/gdb.base/valgrind-disp-step.exp b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
index 13f36837d5e2..c2991b247b9d 100644
--- a/gdb/testsuite/gdb.base/valgrind-disp-step.exp
+++ b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
@@ -35,7 +35,7 @@ if { [vgdb_start] == -1 } {
 }
 
 gdb_test_no_output "set displaced-stepping off"
-gdb_breakpoint "main" "breakpoint at main"
+gdb_breakpoint "main"
 gdb_test "continue" " stop 0 .*" "continue to main"
 delete_breakpoints
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
index 8b929e5de4e6..3ec57cc9c455 100644
--- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
@@ -28,7 +28,7 @@ if {![runto_main]} {
     return -1
 }
 
-gdb_breakpoint [gdb_get_line_number "start_again"] "Breakpoint $decimal at $hex" "start_again"
+gdb_breakpoint [gdb_get_line_number "start_again"]
 
 set sizes {1 2 4 8}
 array set alignedend {1 1  2 2  3 4  4 4  5 8  6 8  7 8  8 8}
@@ -164,8 +164,7 @@ proc size8twice { function cmd offset index } {
     # Set a breakpoint.
     set bp_src_string "${function}_return"
     set bp_loc [gdb_get_line_number $bp_src_string]
-    gdb_breakpoint $bp_loc \
-	"Breakpoint $::decimal at $::hex" "$bp_src_string"
+    gdb_breakpoint $bp_loc
 
     # Set a hardware watchpoint.
     set watch_index [expr {$offset + $index}]
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index 6f81e5e7e491..91da718d19ce 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -29,7 +29,7 @@ if {![runto_main]} {
 
 gdb_test_no_output "set follow-fork-mode child" "1, set follow-fork-mode child"
 gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "1, insert fork catchpoint"
-gdb_breakpoint "start" "" "1, set breakpoint at start"
+gdb_breakpoint "start"
 
 gdb_test "continue" "Catchpoint.*" "1, get to the fork event"
 
diff --git a/gdb/testsuite/gdb.threads/multiple-step-overs.exp b/gdb/testsuite/gdb.threads/multiple-step-overs.exp
index 8433e16340ad..dc4f4ce2db9d 100644
--- a/gdb/testsuite/gdb.threads/multiple-step-overs.exp
+++ b/gdb/testsuite/gdb.threads/multiple-step-overs.exp
@@ -101,7 +101,7 @@ foreach displaced { "off" "on" } {
 
 		# Switch back to thread 1, and continue.
 		gdb_test "thread 1" "Switching.*" "switch back to thread 1"
-		gdb_breakpoint "sigusr1_handler" "set break at sigusr1_handler"
+		gdb_breakpoint "sigusr1_handler"
 
 		set msg "continue to sigusr1_handler"
 		gdb_test_multiple "continue" $msg {
diff --git a/gdb/testsuite/gdb.threads/thread-bp-deleted.exp b/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
index 037e8288b62f..84e464f75528 100644
--- a/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
+++ b/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
@@ -96,8 +96,7 @@ proc check_for_thread_specific_breakpoint { testname bpnum expected } {
 
 # Create a thread-specific breakpoint.  This will never actually be hit; we
 # don't care, we just want to see GDB auto-delete this breakpoint.
-gdb_breakpoint "main thread $worker_thread" \
-    "create a thread-specific breakpoint"
+gdb_breakpoint "main thread $worker_thread"
 set bpnum [get_integer_valueof "\$bpnum" "INVALID" \
 	       "get number for thread-specific breakpoint"]
 
-- 
2.54.0