uefi-ref/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2026-08-27 00:26:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gdb/testsuite: make gdb_breakpoint, runto and runto_main use parse_args

Browse source 
In preparation to adding an option with argument to runto, change these
procs to use parse_args to manage their args (variable arguments).
These three procs have to be converted at the same time, because they
pass args to each other.

I would have like to allow passing options mixed with non-option
arguments, to allow:

  gdb_breakpoint -qualified the_function

But that would be a larger and more difficult change, so we'll have to
stick having options after, like this:

  gdb_breakpoint the_function -qualified

Change all callers that do use options to add the leading dash.

This patch removes the "last one wins" aspect of the message/no-message
options in gdb_breakpoint and runto, but I don't think it's important.
I don't think there is actually a spot that passes both.  I added some
checks in those procs to ensure that.

Change-Id: I1500c60c4b1705ad5cd982d9324b627900ce411b
Reviewed-By: Tankut Baris Aktemur <TankutBaris.Aktemur@amd.com>
This commit is contained in:
Simon Marchi 2026-06-18 15:35:41 -04:00
parent 9011fd4bec
commit 246aecb1cd
115 changed files with 279 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gdb/testsuite/gdb.ada/break-label.exp
View file

@ -26,5 +26,5 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
# Ada is case-insensitive, so both of these should work.
foreach_with_prefix name {break_here Break_Here} {
clean_restart ${testfile}
runto "proc:$name" message
runto "proc:$name" -message
}

2
gdb/testsuite/gdb.ada/finish-var-size.exp
View file

@ -33,7 +33,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $opts] != ""} {
}
clean_restart ${testfile}
runto "pck.get" temporary
runto "pck.get" -temporary
set value [string_to_regexp "= (defined => true, payload => true)"]

6
gdb/testsuite/gdb.ada/import.exp
View file

@ -54,7 +54,7 @@ gdb_test "print pkg.imported_var_ada" " = 42"
gdb_test "print pkg.exported_var_ada" " = 99"
gdb_test "print exported_var_ada" " = 99"
gdb_breakpoint "local_imported_func" message
gdb_breakpoint "local_imported_func" -message
gdb_test "print copy" " = 42"
# This passes with gcc 10 but fails with gcc 9. With gcc 9, we have:
@ -84,11 +84,11 @@ foreach func {"pkg.imported_func_ada" "imported_func"} {
if { [gnat_version_compare < 10] } {
setup_xfail *-*-*
}
gdb_breakpoint $func message
gdb_breakpoint $func -message
}
foreach func {"imported_func_ada" "pkg.exported_func_ada" \
"exported_func_ada" "exported_func"} {
clean_restart $testfile
gdb_breakpoint $func message
gdb_breakpoint $func -message
}

2
gdb/testsuite/gdb.ada/length_cond.exp
View file

@ -29,7 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
clean_restart ${testfile}
set bp_location [gdb_get_line_number "BREAKPOINT" ${testdir}/length_cond.adb]
gdb_breakpoint length_cond.adb:$bp_location message
gdb_breakpoint length_cond.adb:$bp_location -message
# Resolving the conditional expression would cause a crash, so it's
# enough to just set the conditions.

14
gdb/testsuite/gdb.ada/non-ascii-utf-8.exp
View file

@ -49,10 +49,10 @@ gdb_test "print var_𐐩" " = 25"
gdb_test "print VAR_Ż" " = 26"
gdb_test "print var_ż" " = 26"
gdb_breakpoint "FUNC_Ü" message
gdb_breakpoint "func_ü" message
gdb_breakpoint "FUNC_Ƹ" message
gdb_breakpoint "func_ƹ" message
gdb_breakpoint "FUNC_Ż" message
gdb_breakpoint "func_ż" message
gdb_breakpoint "FUNC_𐐁" message
gdb_breakpoint "FUNC_Ü" -message
gdb_breakpoint "func_ü" -message
gdb_breakpoint "FUNC_Ƹ" -message
gdb_breakpoint "func_ƹ" -message
gdb_breakpoint "FUNC_Ż" -message
gdb_breakpoint "func_ż" -message
gdb_breakpoint "FUNC_𐐁" -message

4
gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp
View file

@ -35,7 +35,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint break_here_asm temporary
gdb_breakpoint break_here_asm -temporary
gdb_continue_to_breakpoint "continue to callee"
# Verify the value of x19/w19 in the inner frame (callee).
@ -83,6 +83,6 @@ with_test_prefix "callee, after change in caller" {
# Verify that the value of the saved x19 we changed is correctly seen by the
# inferior.
gdb_breakpoint break_here_c temporary
gdb_breakpoint break_here_c -temporary
gdb_continue_to_breakpoint "continue to break_here_c"
gdb_test "p/x value" " = 0x44454647"

4
gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
View file

@ -38,7 +38,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint break_here_asm temporary
gdb_breakpoint break_here_asm -temporary
gdb_continue_to_breakpoint "continue to callee"
# Verify the value of rbx/ebx in the inner frame (callee).
@ -86,6 +86,6 @@ with_test_prefix "callee, after change in caller" {
# Verify that the value of the saved rbx we changed is correctly seen by the
# inferior.
gdb_breakpoint break_here_c temporary
gdb_breakpoint break_here_c -temporary
gdb_continue_to_breakpoint "continue to break_here_c"
gdb_test "p/x value" " = 0x1011121344454647"

6
gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
View file

@ -72,7 +72,7 @@ proc saved_regs_to_str { savedregs funcname } {
proc prologue_test {funcname {savedregs ""} {fp_offset ""} } {
global hex
gdb_breakpoint $funcname temporary
gdb_breakpoint $funcname -temporary
gdb_continue_to_breakpoint $funcname
gdb_test "backtrace 10" \
"#0\[ \t\]*$hex in $funcname .*\r\n#1\[ \t\]*$hex in main.*" \
@ -130,7 +130,7 @@ prologue_test "enter_s_all" { {r13 4} {r14 8} {r15 12} {r16 16} {r17 20} \
{gp 56} {fp 60} {blink 0} } 0
# Test more levels of backtrace.
gdb_breakpoint nested_prologue_inner temporary
gdb_breakpoint nested_prologue_inner -temporary
gdb_continue_to_breakpoint nested_prologue_inner
gdb_test "backtrace 10" \
"#0\[ \t\]*$hex in nested_prologue_inner .*\r\n#1\[ \t\]*$hex in nested_prologue_outer .*\r\n#2\[ \t\]*$hex in main.*" \
@ -189,7 +189,7 @@ prologue_test "unstored_reg" { {r13 0} {r14 4} }
prologue_test "double_store" { {r14 0} }
# alloca() tests
gdb_breakpoint alloca_inner temporary
gdb_breakpoint alloca_inner -temporary
gdb_continue_to_breakpoint alloca_inner
gdb_test "backtrace 3" \
"#0\[ \t\]*$hex in alloca_inner .*\r\n#1\[ \t\]*$hex in alloca_outer .*\r\n#2\[ \t\]*$hex in main.*" \

4
gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp
View file

@ -40,7 +40,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint break_here_asm temporary
gdb_breakpoint break_here_asm -temporary
gdb_continue_to_breakpoint "continue to callee"
# Verify the value of s16 in the inner frame (callee).
@ -81,6 +81,6 @@ with_test_prefix "callee, after change in caller" {
# Verify that the value of the saved s16 we changed is correctly seen by the
# inferior.
gdb_breakpoint break_here_c temporary
gdb_breakpoint break_here_c -temporary
gdb_continue_to_breakpoint "continue to break_here_c"
gdb_test "p/x value" " = 0x40000000"

4
gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp
View file

@ -35,7 +35,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint break_here_asm temporary
gdb_breakpoint break_here_asm -temporary
gdb_continue_to_breakpoint "continue to callee"
# Verify the value of d8/s16 in the inner frame (callee).
@ -83,6 +83,6 @@ with_test_prefix "callee, after change in caller" {
# Verify that the value of the saved d8 we changed is correctly seen by the
# inferior.
gdb_breakpoint break_here_c temporary
gdb_breakpoint break_here_c -temporary
gdb_continue_to_breakpoint "continue to break_here_c"
gdb_test "p/x value" " = 0x1011121340000000"

4
gdb/testsuite/gdb.arch/powerpc-htm-regs.exp
View file

@ -87,7 +87,7 @@ with_test_prefix "check htm support" {
# Displaced-stepping a tbegin. causes problems,
# so we make the breakpoint temporary.
gdb_breakpoint [gdb_get_line_number "marker" "$gen_src"] temporary
gdb_breakpoint [gdb_get_line_number "marker" "$gen_src"] -temporary
gdb_run_cmd
@ -134,7 +134,7 @@ if {[build_executable "compile" $binfile $srcfile {debug}] == -1} {
clean_restart $testfile
gdb_breakpoint [gdb_get_line_number "first marker"] temporary
gdb_breakpoint [gdb_get_line_number "first marker"] -temporary
gdb_run_cmd

2
gdb/testsuite/gdb.base/annotate-symlink.exp
View file

@ -41,7 +41,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint func message
gdb_breakpoint func -message
gdb_test_no_output "set annotate 1"

2
gdb/testsuite/gdb.base/attach.exp
View file

@ -324,7 +324,7 @@ proc_with_prefix do_attach_tests {} {
# Verify that the modification really happened.
gdb_breakpoint [gdb_get_line_number "postloop"] temporary
gdb_breakpoint [gdb_get_line_number "postloop"] -temporary
gdb_continue_to_breakpoint "postloop" ".* postloop .*"
# Allow the test process to exit, to cleanup after ourselves.

2
gdb/testsuite/gdb.base/break-inline.exp
View file

@ -18,7 +18,7 @@ if { [prepare_for_testing "failed to prepare" "break-inline" {} {debug nowarning
return
}
gdb_breakpoint "main" "temporary"
gdb_breakpoint "main" -temporary
gdb_run_cmd
gdb_test "" "Temporary breakpoint.*foo\\(\\).*"

2
gdb/testsuite/gdb.base/break-interp.exp
View file

@ -133,7 +133,7 @@ proc reach_1 {func command displacement} {
# Breakpoint on _dl_debug_state can have problems due to its overlap
# with the existing internal breakpoint from GDB.
gdb_test_no_output "set stop-on-solib-events 1"
} elseif {! [gdb_breakpoint $func allow-pending]} {
} elseif {! [gdb_breakpoint $func -allow-pending]} {
return
}

14
gdb/testsuite/gdb.base/condbreak-multi-context.exp
View file

@ -133,7 +133,7 @@ proc_with_prefix scenario_1 { start_before } {
clean_restart $::testfile
if { $start_before } {
if {![runto_main temporary]} {
if {![runto_main -temporary]} {
return
}
}
@ -168,7 +168,7 @@ proc_with_prefix scenario_1 { start_before } {
}
if { !$start_before } {
if {![runto_main temporary no-delete-breakpoints]} {
if {![runto_main -temporary -no-delete-breakpoints]} {
return
}
}
@ -245,7 +245,7 @@ proc_with_prefix scenario_2 { start_before } {
clean_restart $::testfile
if { $start_before } {
if {![runto_main temporary]} {
if {![runto_main -temporary]} {
return
}
}
@ -258,7 +258,7 @@ proc_with_prefix scenario_2 { start_before } {
}
if { !$start_before } {
if {![runto_main temporary no-delete-breakpoints]} {
if {![runto_main -temporary -no-delete-breakpoints]} {
return
}
}
@ -293,7 +293,7 @@ proc_with_prefix scenario_3 { start_before } {
clean_restart $::testfile
if { $start_before } {
if {![runto_main temporary]} {
if {![runto_main -temporary]} {
return
}
}
@ -348,7 +348,7 @@ proc_with_prefix scenario_3 { start_before } {
# Do not use runto_main, it deletes all breakpoints.
if { !$start_before } {
if {![runto_main temporary no-delete-breakpoints]} {
if {![runto_main -temporary -no-delete-breakpoints]} {
return
}
}
@ -370,7 +370,7 @@ proc_with_prefix scenario_4 { start_before } {
clean_restart $::testfile
if { $start_before } {
if {![runto_main temporary]} {
if {![runto_main -temporary]} {
return
}
}

2
gdb/testsuite/gdb.base/dlmopen-ns-ids.exp
View file

@ -192,7 +192,7 @@ proc_with_prefix test_conv_vars {} {
gdb_test "print \$_linker_namespace" ".* = 0" \
"Still in the default namespace"
gdb_breakpoint "inc" allow-pending
gdb_breakpoint "inc" -allow-pending
gdb_breakpoint [gdb_get_line_number "TAG: first dlclose"]
foreach_with_prefix dl {3 2 1} {

2
gdb/testsuite/gdb.base/dlmopen.exp
View file

@ -194,7 +194,7 @@ proc test_dlmopen_no_attach {} {
# Break in the to-be-loaded library and at the end of main.
delete_breakpoints
gdb_breakpoint $::srcfile_lib:$::bp_inc allow-pending
gdb_breakpoint $::srcfile_lib:$::bp_inc -allow-pending
gdb_breakpoint $::srcfile:$::bp_main
test_dlmopen

2
gdb/testsuite/gdb.base/eh_return.exp
View file

@ -73,7 +73,7 @@ if { $address == -1 } {
clean_restart $testfile
gdb_assert [gdb_breakpoint "*$address" no-message] "set breakpoint on address"
gdb_assert [gdb_breakpoint "*$address" -no-message] "set breakpoint on address"
# The assert did not reproduce when running to main, and continuing to the
# breakpoint, so instead, run to the breakpoint.

2
gdb/testsuite/gdb.base/foll-exec-mode.exp
View file

@ -127,7 +127,7 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } {
# past it.
#
if {$cmd == "continue"} {
gdb_breakpoint "$execd_line" "allow-pending"
gdb_breakpoint "$execd_line" -allow-pending
}
# Execute past the exec call.

2
gdb/testsuite/gdb.base/foll-vfork.exp
View file

@ -57,7 +57,7 @@ proc setup_gdb { binfile srcfile } {
return -code return
}
gdb_breakpoint [gdb_get_line_number " VFORK " $srcfile] temporary
gdb_breakpoint [gdb_get_line_number " VFORK " $srcfile] -temporary
gdb_continue_to_breakpoint "at VFORK"
}

2
gdb/testsuite/gdb.base/fork-no-detach-follow-child-dlopen.exp
View file

@ -49,7 +49,7 @@ proc do_test {} {
gdb_test_no_output "set follow-fork-mode child"
gdb_test_no_output "set detach-on-fork off"
runto "add" qualified allow-pending
runto "add" -qualified -allow-pending
# Since we have debug info in the shlib, we should have the file name available.
gdb_test "frame" "add \(.*\) at .*$::srcfile2:${::decimal}.*"

12
gdb/testsuite/gdb.base/fullname.exp
View file

@ -48,7 +48,7 @@ set line [gdb_get_line_number "set breakpoint 1 here"]
clean_restart $testfile
set msg "set breakpoint by full path before loading symbols - built absolute"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg
@ -58,7 +58,7 @@ gdb_test "break -q main" \
"Breakpoint.*at.*line.*" "set breakpoint at main - built absolute"
set msg "set breakpoint by full path after loading symbols - built absolute"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg
@ -73,7 +73,7 @@ if { [gdb_compile [relative_filename [pwd] [build_standard_output_file tmp-${sr
clean_restart $testfile
set msg "set breakpoint by full path before loading symbols - built relative"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg
@ -83,7 +83,7 @@ gdb_test "break -q main" \
"Breakpoint.*at.*line.*" "set breakpoint at main - built relative"
set msg "set breakpoint by full path after loading symbols - built relative"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg
@ -102,7 +102,7 @@ with_cwd [standard_output_file {}] {
clean_restart $testfile
set msg "set breakpoint by full path before loading symbols - built other"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg
@ -112,7 +112,7 @@ gdb_test "break -q main" \
"Breakpoint.*at.*line.*" "set breakpoint at main - built other"
set msg "set breakpoint by full path after loading symbols - built other"
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} -no-message] != 0 } {
pass $msg
} else {
fail $msg

2
gdb/testsuite/gdb.base/gdb-sigterm.exp
View file

@ -39,7 +39,7 @@ proc do_test { pass } {
}
gdb_breakpoint "${testfile}.c:[gdb_get_line_number "loop-line" ${testfile}.c]" \
temporary
-temporary
gdb_test "continue" "Temporary breakpoint .* loop-line .*"

2
gdb/testsuite/gdb.base/gdb1250.exp
View file

@ -28,7 +28,7 @@ if { [prepare_for_testing "prepare" $testfile $srcfile] != 0 } {
return
}
if {![runto abort {allow-pending}]} {
if {![runto abort -allow-pending]} {
return
}

2
gdb/testsuite/gdb.base/infcall-failure-2.exp
View file

@ -23,7 +23,7 @@ if { ![runto_main] } {
return
}
if { ![gdb_breakpoint "*0x1" message] } {
if { ![gdb_breakpoint "*0x1" -message] } {
return
}

2
gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
View file

@ -93,7 +93,7 @@ proc start_nested_structs_test { lang types } {
# Some targets only enable the FPU on first use, so ensure that we
# have used the FPU before we make calls from GDB to code that
# could use the FPU.
gdb_breakpoint [gdb_get_line_number "Break Here"] temporary
gdb_breakpoint [gdb_get_line_number "Break Here"] -temporary
gdb_continue_to_breakpoint "breakpt" ".* Break Here\\. .*"
return 1

6
gdb/testsuite/gdb.base/inferior-args.exp
View file

@ -76,7 +76,7 @@ proc do_test { method startup_with_shell inferior_args expected_results \
gdb_test "" "" "stop at first instruction"
# Put a breakpoint and continue until main.
if { ![gdb_breakpoint "main" message] } {
if { ![gdb_breakpoint "main" -message] } {
fail "could not set breakpoint on main"
return -1
}
@ -87,7 +87,7 @@ proc do_test { method startup_with_shell inferior_args expected_results \
}
} elseif { $method == "run" } {
if { ![gdb_breakpoint "main" message] } {
if { ![gdb_breakpoint "main" -message] } {
fail "could not set breakpoint on main"
return -1
}
@ -253,7 +253,7 @@ proc run_all_tests {} {
}
# Now place a breakpoint on main.
if { ![gdb_breakpoint "main" message] } {
if { ![gdb_breakpoint "main" -message] } {
fail "could not set breakpoint on main"
continue
}

4
gdb/testsuite/gdb.base/info-shared.exp
View file

@ -91,8 +91,8 @@ check_info_shared "info sharedlibrary #1" 0 0
# Set up breakpoints.
gdb_breakpoint "stop"
gdb_breakpoint "foo" allow-pending
gdb_breakpoint "bar" allow-pending
gdb_breakpoint "foo" -allow-pending
gdb_breakpoint "bar" -allow-pending
# Run to the first stop and check that only the first library is loaded.
gdb_continue_to_breakpoint "library load #1" "\\.?stop .*"

2
gdb/testsuite/gdb.base/jit-reader.exp
View file

@ -302,7 +302,7 @@ proc jit_reader_test {} {
# Check that the DWARF unwinder does not crash in presence of
# JIT objfiles.
gdb_test "up"
gdb_breakpoint "*function_add" temporary
gdb_breakpoint "*function_add" -temporary
gdb_test "cont" ".*Temporary breakpoint ${any} in jit_function_add .*"
gdb_test "bt" \
[multi_line \

2
gdb/testsuite/gdb.base/nostdlib.exp
View file

@ -75,7 +75,7 @@ foreach_with_prefix pie { "nopie" "pie" } {
# Instead of trying to cater for all these possibilities in a controlled
# fashion, make the breakpoint temporary, ensuring that there will just be
# one stop.
gdb_breakpoint "*_start" temporary
gdb_breakpoint "*_start" -temporary
gdb_run_cmd

2
gdb/testsuite/gdb.base/prologue.exp
View file

@ -29,7 +29,7 @@ if {![runto_main]} {
proc find_breakpoint_pc { sym } {
global decimal hex gdb_prompt
if { [gdb_breakpoint $sym temporary] } {
if { [gdb_breakpoint $sym -temporary] } {
pass "setting breakpoint at $sym"
}

2
gdb/testsuite/gdb.base/run-attach-while-running.exp
View file

@ -68,7 +68,7 @@ proc_with_prefix test { non-stop threaded run-or-attach } {
return
}
gdb_breakpoint "all_started" "temporary"
gdb_breakpoint "all_started" -temporary
gdb_continue_to_breakpoint "continue to all_started"
# If all-stop, everything stopped when we hit the all_started

2
gdb/testsuite/gdb.base/shlib-call.exp
View file

@ -167,7 +167,7 @@ clean_restart $testfile
# PR's 16495, 18213
# test that we can re-set breakpoints in shared libraries
gdb_breakpoint "shr1" "allow-pending"
gdb_breakpoint "shr1" -allow-pending
set test "run to bp in shared library"
gdb_run_cmd

4
gdb/testsuite/gdb.base/solib-bad-entry-addr.exp
View file

@ -94,6 +94,6 @@ if { $load_segment_count <= 2 } {
# then we will see an internal error once the inferior starts running.
clean_restart $testfile
if {![runto_main message]} {
return
if {![runto_main -message]} {
return
}

2
gdb/testsuite/gdb.base/solib-vanish.exp
View file

@ -104,7 +104,7 @@ delete_breakpoints
set lib2_lineno [gdb_get_line_number "break here" ${srcfile_lib2}]
gdb_breakpoint "${lib2name}.c:${lib2_lineno}" {allow-pending}
gdb_breakpoint "${lib2name}.c:${lib2_lineno}" -allow-pending
# Verify that both the location and source code are displayed
gdb_continue_to_breakpoint "bar" \

2
gdb/testsuite/gdb.base/stale-infcall.exp
View file

@ -23,7 +23,7 @@ if {![runto_main]} {
return
}
gdb_breakpoint [gdb_get_line_number "test-next"] temporary
gdb_breakpoint [gdb_get_line_number "test-next"] -temporary
gdb_continue_to_breakpoint "test-next" ".* test-next .*"
gdb_breakpoint [gdb_get_line_number "test-fail"]
gdb_test_no_output {set $test_fail_bpnum=$bpnum}

2
gdb/testsuite/gdb.base/sym-file.exp
View file

@ -83,7 +83,7 @@ proc do_test { remove_expr } {
gdb_continue_to_breakpoint gdb_add_symbol_file
# 2) Set a pending breakpoint at bar in $srcfile3.
set result [gdb_breakpoint bar allow-pending]
set result [gdb_breakpoint bar -allow-pending]
if {!$result} {
return
}

2
gdb/testsuite/gdb.base/symlink-sourcefile.exp
View file

@ -40,5 +40,5 @@ if {![runto_main]} {
}
# Using a line number ensures that the default symtab is used.
gdb_breakpoint [gdb_get_line_number "break here" $srcfile] message
gdb_breakpoint [gdb_get_line_number "break here" $srcfile] -message
gdb_continue_to_breakpoint "run to breakpoint marker"

22
gdb/testsuite/gdb.base/tls-dlobj.exp
View file

@ -57,7 +57,7 @@ proc gdb_test_with_xfail { cmd re cond} {
proc do_tests {force_internal_tls} {
clean_restart $::testfile
if {![runto main temporary]} {
if {![runto main -temporary]} {
return
}
@ -65,7 +65,7 @@ proc do_tests {force_internal_tls} {
gdb_test_no_output "maint set force-internal-tls-address-lookup on"
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-1"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-1"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-1"
with_test_prefix "before assignments" {
@ -100,7 +100,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-2"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-2"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-2"
with_test_prefix "at main-breakpoint-2" {
@ -117,7 +117,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-3"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-3"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-3"
# At this point lib2 and lib3 have been unloaded. Also, TLS vars
@ -137,7 +137,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-4"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-4"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-4"
# lib3 has been loaded again; lib2 is the only one not loaded.
@ -157,7 +157,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-5"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-5"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-5"
# lib2 and lib3 are loaded; lib1 and lib4 are not.
@ -177,7 +177,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-6"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-6"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-6"
# lib1, lib3 and lib4 are loaded; lib2 is not loaded.
@ -197,7 +197,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-7"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-7"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-7"
# lib2 and lib3 are loaded; lib1 and lib4 are not.
@ -217,7 +217,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-8"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-8"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-8"
# lib1, lib2, lib3, and lib4 are all loaded.
@ -236,7 +236,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-9"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-9"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-9"
# lib2 is loaded; lib1, lib3, and lib4 are not.
@ -255,7 +255,7 @@ proc do_tests {force_internal_tls} {
}
}
gdb_breakpoint [gdb_get_line_number "main-breakpoint-10"] temporary
gdb_breakpoint [gdb_get_line_number "main-breakpoint-10"] -temporary
gdb_continue_to_breakpoint "main-breakpoint-10"
# lib3 and lib4 are loaded; lib1 and lib2 are not.

8
gdb/testsuite/gdb.base/unload.exp
View file

@ -63,8 +63,8 @@ gdb_load_shlib $lib_sl2
# manually loaded and unloaded
#
gdb_breakpoint "shrfunc1" allow-pending
gdb_breakpoint "shrfunc2" allow-pending
gdb_breakpoint "shrfunc1" -allow-pending
gdb_breakpoint "shrfunc2" -allow-pending
gdb_test "info break" \
"Num Type\[ \]+Disp Enb Address\[ \]+What\r?
@ -85,7 +85,7 @@ gdb_test "info break" \
2\[\t \]+breakpoint keep y *<PENDING> *shrfunc2.*" \
"pending breakpoint info on first run at shrfunc1"
gdb_breakpoint "$testfile.c:[gdb_get_line_number "y-set-1" $testfile.c]" temporary
gdb_breakpoint "$testfile.c:[gdb_get_line_number "y-set-1" $testfile.c]" -temporary
gdb_test "continue" \
"Continuing.*warning: Temporarily disabling breakpoints for.*${lib_syms}.*y-set-1.*" \
@ -108,7 +108,7 @@ gdb_test "info break" \
2\[\t \]+breakpoint keep y *<PENDING> *shrfunc2.*" \
"pending breakpoint info on second run at shrfunc1"
gdb_breakpoint "$testfile.c:[gdb_get_line_number "y-set-1" $testfile.c]" temporary
gdb_breakpoint "$testfile.c:[gdb_get_line_number "y-set-1" $testfile.c]" -temporary
gdb_test "continue" \
"Continuing.*warning: Temporarily disabling breakpoints for.*${lib_syms}.*y-set-1.*" \

2
gdb/testsuite/gdb.btrace/rn-dl-bind.exp
View file

@ -53,7 +53,7 @@ with_test_prefix "main" {
# debug information we may stop at the closing brace or at the return.
#
# instead, run to test
gdb_breakpoint test {temporary}
gdb_breakpoint test -temporary
gdb_test "reverse-continue" ".*test\.1.*"
with_test_prefix "test" {

4
gdb/testsuite/gdb.cp/anon-ns.exp
View file

@ -55,9 +55,9 @@ foreach test $methods {
gdb_test "list $test" $result
gdb_test "list '$test'" $result
gdb_assert { [gdb_breakpoint $test no-message] } \
gdb_assert { [gdb_breakpoint $test -no-message] } \
"break $test, unquoted"
gdb_assert { [gdb_breakpoint '$test' no-message] } \
gdb_assert { [gdb_breakpoint '$test' -no-message] } \
"break $test, single-quoted"
}

2
gdb/testsuite/gdb.cp/breakpoint-shlib-func.exp
View file

@ -48,7 +48,7 @@ gdb_test "break foo" "Breakpoint $decimal at $hex"
gdb_test "info breakpoints" "<foo\\(\\)@plt>"
# Runto main, but don't delete all the breakpoints.
if {![runto_main no-delete-breakpoints]} {
if {![runto_main -no-delete-breakpoints]} {
return
}

4
gdb/testsuite/gdb.cp/meth-typedefs.exp
View file

@ -152,9 +152,9 @@ foreach test $methods {
gdb_test "list -qualified $func" $result
gdb_test "list -qualified '$func'" $result
gdb_assert { [gdb_breakpoint "-qualified $func" no-message] } \
gdb_assert { [gdb_breakpoint "-qualified $func" -no-message] } \
"break -qualified $func, unquoted"
gdb_assert { [gdb_breakpoint "-qualified '$func'" no-message] } \
gdb_assert { [gdb_breakpoint "-qualified '$func'" -no-message] } \
"break -qualified $func, single-quoted"
}

2
gdb/testsuite/gdb.cp/nextoverthrow.exp
View file

@ -37,7 +37,7 @@ proc tbreak_and_cont {text} {
global testfile
set line [gdb_get_line_number $text $testfile.cc]
gdb_breakpoint "$testfile.cc:$line" temporary
gdb_breakpoint "$testfile.cc:$line" -temporary
gdb_test "continue" "Temporary breakpoint.*" "continuing to $text"
}

2
gdb/testsuite/gdb.cp/paramless.exp
View file

@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
}
foreach ordinary {"outer<int>::fn" "outer<char>::fn<short>" "toplev<char>"} {
gdb_breakpoint $ordinary message
gdb_breakpoint $ordinary -message
clean_restart $testfile
}

2
gdb/testsuite/gdb.cp/save-bp-qualified.exp
View file

@ -41,7 +41,7 @@ with_test_prefix "save" {
return
}
gdb_breakpoint "function" qualified
gdb_breakpoint "function" -qualified
gdb_breakpoint "function"
# Save the breakpoints into a file.

2
gdb/testsuite/gdb.cp/step-and-next-inline.exp
View file

@ -74,7 +74,7 @@ proc do_test { use_header } {
clean_restart $executable
if {![runto $main_location qualified]} {
if {![runto $main_location -qualified]} {
return
}

6
gdb/testsuite/gdb.cp/subtypes.exp
View file

@ -70,14 +70,14 @@ foreach t { int char } {
}
}
gdb_breakpoint "Outer::Inner::doit" message
gdb_breakpoint "Outer::Inner::doit" -message
foreach s { Foo Bar Baz } {
gdb_breakpoint "main::${s}::doit" message
gdb_breakpoint "main::${s}::doit" -message
}
foreach t { int char } {
foreach s { Foo Bar Baz } {
gdb_breakpoint "foobar<$t>(int)::${s}::doit" message
gdb_breakpoint "foobar<$t>(int)::${s}::doit" -message
}
}

16
gdb/testsuite/gdb.cp/templates.exp
View file

@ -637,8 +637,8 @@ foreach t [list "int" "char" "Empty<int>"] {
gdb_test "break Foozle::fogey ($t)" "Breakpoint.*at.* \\(3 locations\\)"
gdb_test "break Foozle::fogey<$t>" "Breakpoint.*at.* \\(3 locations\\)"
foreach u [list "int" "char" "Empty<int>"] {
gdb_breakpoint "Foozle<$t>::fogey<$u>" message
gdb_assert { [gdb_breakpoint "Foozle<$t>::fogey<$u> ($u)" no-message] } \
gdb_breakpoint "Foozle<$t>::fogey<$u>" -message
gdb_assert { [gdb_breakpoint "Foozle<$t>::fogey<$u> ($u)" -no-message] } \
"break Foozle<$t>::fogey<$u> ($u), success"
}
}
@ -660,19 +660,19 @@ gdb_test "break -source $srcfile -func operator<<" \
"Breakpoint.*at.* \\(2 locations\\)"
foreach t [list "Empty" "Foozle"] {
set tt "$t<int>"
gdb_breakpoint "operator< <$tt>" message
gdb_breakpoint "operator<< <$tt>" message
gdb_breakpoint "operator< <$tt>" -message
gdb_breakpoint "operator<< <$tt>" -message
# Try a specific instance, both with and without whitespace
# after the template-template parameter.
set loc "operator< <$tt> ($tt&, $tt&)"
gdb_assert { [gdb_breakpoint $loc no-message] } "break $loc, success"
gdb_assert { [gdb_breakpoint $loc -no-message] } "break $loc, success"
set loc "operator< <$tt > ($tt&, $tt&)"
gdb_assert { [gdb_breakpoint $loc no-message] } "break $loc, success"
gdb_assert { [gdb_breakpoint $loc -no-message] } "break $loc, success"
set loc "operator<< <$tt> ($tt&, $tt&)"
gdb_assert { [gdb_breakpoint $loc no-message] } "break $loc, success"
gdb_assert { [gdb_breakpoint $loc -no-message] } "break $loc, success"
set loc "operator<< <$tt > ($tt&, $tt&)"
gdb_assert { [gdb_breakpoint $loc no-message] } "break $loc, success"
gdb_assert { [gdb_breakpoint $loc -no-message] } "break $loc, success"
}
# Test that "-qualified" finds no matching locations.

2
gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
View file

@ -233,7 +233,7 @@ proc_with_prefix local_url { } {
gdb_breakpoint $lineno
# Run to main, but don't delete all breakpoints.
if {![runto_main no-delete-breakpoints]} {
if {![runto_main -no-delete-breakpoints]} {
return
}

4
gdb/testsuite/gdb.dwarf2/ada-cold-name.exp
View file

@ -63,8 +63,8 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
}
gdb_test_no_output "set language ada"
gdb_breakpoint "pck.xtra.function" message
gdb_breakpoint "pck.xtra.function\[cold\]" message
gdb_breakpoint "pck.xtra.function" -message
gdb_breakpoint "pck.xtra.function\[cold\]" -message
gdb_test "complete break pck.xtra.function\[co" \
"break pck.xtra.function\\\[cold\\\]" \
"test completion of cold function"

8
gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp
View file

@ -68,8 +68,8 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
with_test_prefix "first first" {
gdb_test_no_output "set language ada"
gdb_breakpoint "<__gnat_namefirst>" message
gdb_breakpoint "<__gnat_namesecond>" message
gdb_breakpoint "<__gnat_namefirst>" -message
gdb_breakpoint "<__gnat_namesecond>" -message
}
# Run the test again, but this time check the symbols in the other
@ -80,6 +80,6 @@ clean_restart ${testfile}
with_test_prefix "second first" {
gdb_test_no_output "set language ada"
gdb_breakpoint "<__gnat_namesecond>" message
gdb_breakpoint "<__gnat_namefirst>" message
gdb_breakpoint "<__gnat_namesecond>" -message
gdb_breakpoint "<__gnat_namefirst>" -message
}

2
gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp
View file

@ -31,4 +31,4 @@ if { [skip_inline_frame_tests] } {
# Set a break-point in inline function bar, in a CU for which the partial
# symtab has not been expanded.
gdb_breakpoint "bar" message
gdb_breakpoint "bar" -message

2
gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp
View file

@ -53,5 +53,5 @@ if {![runto_main]} {
return
}
set breakpoint_at_missing_lineno_set [gdb_breakpoint "1" no-message]
set breakpoint_at_missing_lineno_set [gdb_breakpoint "1" -no-message]
gdb_assert { !$breakpoint_at_missing_lineno_set }

2
gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
View file

@ -71,4 +71,4 @@ if {![runto_main]} {
return
}
gdb_breakpoint "$srcfile:27" message
gdb_breakpoint "$srcfile:27" -message

2
gdb/testsuite/gdb.dwarf2/inlined_subroutine-inheritance.exp
View file

@ -208,4 +208,4 @@ if {[prepare_for_testing "failed to prepare" $testfile \
# All we need to do is set a breakpoint, which causes the DWARF
# info to be read, to demonstrate the problem.
gdb_breakpoint "bytes_repeat" message
gdb_breakpoint "bytes_repeat" -message

4
gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
View file

@ -102,7 +102,7 @@ with_test_prefix "first session" {
gdb_load_shlib ${lib_so}
# Run to foo to make sure foo refers to the function, and not foo@PLT.
if {![runto foo qualified]} {
if {![runto foo -qualified]} {
return
}
@ -370,5 +370,5 @@ with_test_prefix "third session" {
# the same thing. It's at this step that an internal error would
# occur for PR28030. The "message" argument tells runto to turn on
# the printing of PASSes while runto is doing its job.
runto "bar" message
runto "bar" -message
}

2
gdb/testsuite/gdb.dwarf2/struct-decl.exp
View file

@ -69,4 +69,4 @@ if {[prepare_for_testing "failed to prepare" ${testfile} \
return
}
gdb_breakpoint "the_type::method" message
gdb_breakpoint "the_type::method" -message

4
gdb/testsuite/gdb.gdb/python-helper.exp
View file

@ -66,8 +66,8 @@ proc test_python_helper {} {
# (a) is easy to reach by issuing a simple gdb command, and
# (b) is unlikely to be modified very often within gdb, and
# (c) has a parameter that is either a 'struct type *' or a 'struct value *'.
gdb_breakpoint value_print qualified
gdb_breakpoint c_print_type qualified
gdb_breakpoint value_print -qualified
gdb_breakpoint c_print_type -qualified
# With gdb build with -O2 -flto=auto and gcc 7.5.0, we can get the mangled
# names due to a problem in the debug info, so we work around this by less

4
gdb/testsuite/gdb.go/methods.exp
View file

@ -72,7 +72,7 @@ if { $found_wrong_foo } {
# <6c46c> DW_AT_name : main.T.Foo
}
if { [gdb_breakpoint ${bp_location1} message]} {
if { [gdb_breakpoint ${bp_location1} -message]} {
gdb_test "cont" "Breakpoint .*, ${bp_location1}.*" \
"going to first breakpoint"
}
@ -96,7 +96,7 @@ if { $found_wrong_bar == 1 } {
# diverge between gc and gccgo. So, we accept the main.T.Bar as valid.
}
if { [gdb_breakpoint ${bp_location2} message] } {
if { [gdb_breakpoint ${bp_location2} -message] } {
gdb_test "cont" "Breakpoint .*, ${bp_location2}.*" \
"going to second breakpoint"
}

2
gdb/testsuite/gdb.go/no-package.exp
View file

@ -28,4 +28,4 @@ if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]}
}
# The bug was that stopping in _start would crash.
runto "*_start" message
runto "*_start" -message

4
gdb/testsuite/gdb.linespec/explicit.exp
View file

@ -580,7 +580,7 @@ namespace eval $testfile {
set tst "pending invalid conditional explicit breakpoint"
if {![gdb_breakpoint "-func myfunction if foofoofoo == 1" \
allow-pending]} {
-allow-pending]} {
fail "set $tst"
} else {
gdb_test "info break" ".*PENDING.*myfunction\r\n\\s+stop only if foofoofoo == 1.*" $tst
@ -597,7 +597,7 @@ namespace eval $testfile {
set tst "pending valid conditional explicit breakpoint"
if {![gdb_breakpoint "-func myfunction if arg == 0" \
allow-pending]} {
-allow-pending]} {
fail "set $tst"
} else {
gdb_test "info break" \

12
gdb/testsuite/gdb.linespec/keywords.exp
View file

@ -32,16 +32,16 @@ gdb_test_no_output "set breakpoint pending off"
# The linespec lexer ignores the language setting when lexing
# keywords.
gdb_test "break if" "Function \"if\" not defined."
gdb_breakpoint "thread" "message"
gdb_breakpoint "task" "message"
gdb_breakpoint "thread" -message
gdb_breakpoint "task" -message
# The lexer should prune any trailing whitesapce, so the expected
# outcome of the following tests should be the same as the previous
# tests.
with_test_prefix "trailing whitespace" {
gdb_test "break if " "Function \"if\" not defined."
gdb_breakpoint "thread " "message"
gdb_breakpoint "task " "message"
gdb_breakpoint "thread " -message
gdb_breakpoint "task " -message
}
# With a single keyword specified first in the location,
@ -56,7 +56,7 @@ gdb_test "break thread 123" "Unknown thread 123\\."
gdb_test "break thread foo" "Invalid thread ID: foo"
gdb_test "break task 123" "Unknown task 123\\."
gdb_test "break task foo" "Junk 'foo' after task keyword\\."
gdb_breakpoint "thread if 0" "message"
gdb_breakpoint "thread if 0" -message
# These are also NULL locations, but using a subsequent keyword
# as the "junk".
@ -86,7 +86,7 @@ foreach prefix {"" "thread 1 "} {
"You can specify only one thread\\."
} else {
gdb_breakpoint "main ${prefix}-force-condition${suffix}${cond}"\
"message"
-message
}
}
}

2
gdb/testsuite/gdb.linespec/thread.exp
View file

@ -35,6 +35,6 @@ gdb_test "break $srcfile:$bp_location1" \
gdb_continue_to_breakpoint "$bp_location1"
gdb_breakpoint "thread" "message"
gdb_breakpoint "thread" -message
gdb_continue_to_breakpoint "thread function"

2
gdb/testsuite/gdb.multi/inferior-specific-bp.exp
View file

@ -187,7 +187,7 @@ check_info_breakpoints "first check for inferior specific breakpoint" \
$bp_number 2
# Create a multi-inferior breakpoint to stop at.
gdb_breakpoint "stop_breakpt" message
gdb_breakpoint "stop_breakpt" -message
set stop_bp_num [get_integer_valueof "\$bpnum" "INVALID" \
"get b/p number for stop_breakpt"]

2
gdb/testsuite/gdb.multi/multi-kill.exp
View file

@ -60,7 +60,7 @@ proc start_inferior {num} {
gdb_load $binfile
gdb_breakpoint "initialized" {temporary}
gdb_breakpoint "initialized" -temporary
gdb_run_cmd
gdb_test "" ".*reakpoint .*, initialized .*${srcfile}.*" "run"

2
gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp
View file

@ -107,7 +107,7 @@ proc do_bp_test { bp_type bp_pending } {
set bp_restriction "inferior 1"
}
gdb_breakpoint "$bp_func $bp_restriction" allow-pending
gdb_breakpoint "$bp_func $bp_restriction" -allow-pending
set bp_number [get_integer_valueof "\$bpnum" "INVALID" \
"get b/p number for previous breakpoint"]

16
gdb/testsuite/gdb.multi/pending-bp.exp
View file

@ -53,7 +53,7 @@ proc do_test_setup { inf_1_stop inf_2_stop } {
return false
}
gdb_breakpoint [gdb_get_line_number ${inf_1_stop}] temporary
gdb_breakpoint [gdb_get_line_number ${inf_1_stop}] -temporary
gdb_continue_to_breakpoint "move inferior 1 into position"
gdb_test "add-inferior -exec ${::binfile}" \
@ -64,7 +64,7 @@ proc do_test_setup { inf_1_stop inf_2_stop } {
return false
}
gdb_breakpoint [gdb_get_line_number ${inf_2_stop}] temporary
gdb_breakpoint [gdb_get_line_number ${inf_2_stop}] -temporary
gdb_continue_to_breakpoint "move inferior 2 into position"
gdb_test_no_output "set breakpoint pending on"
@ -125,7 +125,7 @@ proc_with_prefix test_no_inf_display {} {
# there will be no locations and the breakpoint will be created
# pending. Pass the 'allow-pending' flag so the gdb_breakpoint
# correctly expects the new breakpoint to be pending.
gdb_breakpoint "foo" allow-pending
gdb_breakpoint "foo" -allow-pending
set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \
"get foo breakpoint number"]
@ -138,7 +138,7 @@ proc_with_prefix test_no_inf_display {} {
# Now select inferior 1 and allow the inferior to run forward to the
# point where a breakpoint location for foo will have been created.
gdb_test "inferior 1" "Switching to inferior 1 .*"
gdb_breakpoint [gdb_get_line_number "Break after open"] temporary
gdb_breakpoint [gdb_get_line_number "Break after open"] -temporary
gdb_continue_to_breakpoint \
"move inferior 1 until a location has been added"
@ -151,7 +151,7 @@ proc_with_prefix test_no_inf_display {} {
# Continue inferior 1 until the shared library has been unloaded. The
# breakpoint on 'foo' will return to the pending state. We will need to
# 'continue' twice as the first time will hit the 'foo' breakpoint.
gdb_breakpoint [gdb_get_line_number "Break after close"] temporary
gdb_breakpoint [gdb_get_line_number "Break after close"] -temporary
gdb_continue_to_breakpoint "hit the breakpoint in foo"
gdb_continue_to_breakpoint "after close library"
@ -195,7 +195,7 @@ proc_with_prefix test_pending_toggle { } {
"\\s+breakpoint already hit 1 time"] \
"check thread-specific breakpoint is no longer pending"
gdb_breakpoint [gdb_get_line_number "Break after close"] temporary
gdb_breakpoint [gdb_get_line_number "Break after close"] -temporary
gdb_continue_to_breakpoint "close library"
gdb_test "info breakpoints $bpnum" \
[multi_line \
@ -264,7 +264,7 @@ proc_with_prefix py_test_toggle_thread {} {
"\\s+breakpoint already hit 1 time"] \
"check thread-specific breakpoint has returned to pending"
gdb_breakpoint [gdb_get_line_number "Break after close"] temporary
gdb_breakpoint [gdb_get_line_number "Break after close"] -temporary
gdb_continue_to_breakpoint "stop after close in inferior 2" \
".* Break after close\\. .*"
@ -315,7 +315,7 @@ proc_with_prefix py_test_clear_thread {} {
"\\s+breakpoint already hit 2 times"] \
"check for a location only in inferior 2"
gdb_breakpoint [gdb_get_line_number "Break after close"] temporary
gdb_breakpoint [gdb_get_line_number "Break after close"] -temporary
gdb_continue_to_breakpoint "stop after close in inferior 1" \
".* Break after close\\. .*"

4
gdb/testsuite/gdb.multi/watchpoint-multi.exp
View file

@ -46,14 +46,14 @@ if {[support_displaced_stepping]} {
#gdb_test_no_output "maintenance set show-debug-regs on"
#gdb_test_no_output "set debug infrun 1"
gdb_breakpoint main {temporary}
gdb_breakpoint main -temporary
gdb_test "run" "Temporary breakpoint.* main .*" "start to main inferior 1"
gdb_test "add-inferior" "Added inferior 2 on connection .*" "add inferior 2"
gdb_test "inferior 2" "witching to inferior 2 .*" "switch to inferior 2, first time"
gdb_load $binfile
gdb_breakpoint main {temporary}
gdb_breakpoint main -temporary
gdb_test "run" "Temporary breakpoint.* main .*" "start to main inferior 2"
gdb_test "awatch c" \

4
gdb/testsuite/gdb.opt/inline-break.exp
View file

@ -200,9 +200,9 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
# Assemble flags to pass to gdb_breakpoint. Lame but this is just
# a test suite!
set break_flags "message"
set break_flags "-message"
if {[string match $cmd "tbreak"]} {
lappend break_flags "temporary"
lappend break_flags "-temporary"
}
# Insert breakpoints for all inline_func? and not_inline_func? and check

2
gdb/testsuite/gdb.python/py-breakpoint.exp
View file

@ -629,7 +629,7 @@ proc_with_prefix test_bkpt_address {} {
proc_with_prefix test_bkpt_pending {} {
delete_breakpoints
gdb_breakpoint "nosuchfunction" allow-pending
gdb_breakpoint "nosuchfunction" -allow-pending
gdb_test "python print (gdb.breakpoints()\[0\].pending)" "True" \
"Check pending status of pending breakpoint"
}

2
gdb/testsuite/gdb.python/py-events.exp
View file

@ -41,7 +41,7 @@ gdb_test_no_output "source ${pyfile}" "load python file"
gdb_test "test-objfile-events" "Object file events registered."
gdb_breakpoint "main" {temporary}
gdb_breakpoint "main" -temporary
gdb_test "run" ".*event type: new_objfile.*new objfile name.*" "new objfile notification"

2
gdb/testsuite/gdb.python/py-finish-breakpoint.exp
View file

@ -128,7 +128,7 @@ with_test_prefix "no debug symbol" {
}
gdb_test "print do_nothing" "no debug info.*" "ensure that shared lib has no debug info"
gdb_breakpoint "do_nothing" {temporary}
gdb_breakpoint "do_nothing" -temporary
gdb_test "continue" "Temporary breakpoint .*in \\.?do_nothing.*" \
"continue to do_nothing"

10
gdb/testsuite/gdb.reverse/finish-reverse-next.exp
View file

@ -64,7 +64,7 @@ if {[supports_process_record]} {
# Set breakpoint at call to function1 in main.
set bp_LEP_test [gdb_get_line_number "CALL VIA LEP" $srcfile]
gdb_breakpoint $srcfile:$bp_LEP_test temporary
gdb_breakpoint $srcfile:$bp_LEP_test -temporary
# Continue to break point at function1 call in main.
gdb_continue_to_breakpoint \
@ -93,7 +93,7 @@ gdb_test_no_output "record" "turn on process record for test2"
### TEST 2: reverse finish from the body of function1.
# Set breakpoint at call to function1 in main.
gdb_breakpoint $srcfile:$bp_LEP_test temporary
gdb_breakpoint $srcfile:$bp_LEP_test -temporary
# Continue to break point at function1 call in main.
gdb_continue_to_breakpoint \
@ -124,7 +124,7 @@ gdb_test_no_output "record" "turn on process record for test3"
# Set breakpoint at call to funp in main.
set bp_GEP_test [gdb_get_line_number "CALL VIA GEP" $srcfile]
gdb_breakpoint $srcfile:$bp_GEP_test temporary
gdb_breakpoint $srcfile:$bp_GEP_test -temporary
# Continue to break point at funp call in main.
gdb_continue_to_breakpoint \
@ -153,7 +153,7 @@ gdb_test_no_output "record" "turn on process record for test4"
# Set breakpoint at call to funp in main.
set bp_GEP_test [gdb_get_line_number "CALL VIA GEP" $srcfile]
gdb_breakpoint $srcfile:$bp_GEP_test temporary
gdb_breakpoint $srcfile:$bp_GEP_test -temporary
# Continue to break point at funp call in main.
gdb_continue_to_breakpoint \
@ -184,7 +184,7 @@ gdb_test_no_output "record" "turn on process record for test5"
### TEST 5: reverse finish from the body of function 1 when calling using the
### alternate entrypoint (GEP).
gdb_breakpoint $srcfile:$bp_GEP_test temporary
gdb_breakpoint $srcfile:$bp_GEP_test -temporary
# Continue to break point at funp call.
gdb_continue_to_breakpoint \

4
gdb/testsuite/gdb.reverse/func-map-to-same-line.exp
View file

@ -46,7 +46,7 @@ proc run_tests {} {
# Set breakpoint at the line after the function calls.
set bp_start_reverse_test [gdb_get_line_number "START REVERSE TEST"]
gdb_breakpoint $bp_start_reverse_test temporary
gdb_breakpoint $bp_start_reverse_test -temporary
# Continue to break point for reverse-next test.
# Command definition: reverse-next [count]
@ -87,7 +87,7 @@ proc run_tests {} {
# Test 2, reverse-step command
# Set breakpoint at the line after the function calls.
gdb_breakpoint $bp_start_reverse_test temporary
gdb_breakpoint $bp_start_reverse_test -temporary
# Continue to the start of the reverse-step test.
# Command definition: reverse-step [count]

4
gdb/testsuite/gdb.reverse/i386-avx-reverse.exp
View file

@ -105,8 +105,8 @@ proc test_one_memory {insn mem value {dynamic false} {prefix ""}} {
proc record_full_function {function} {
set end [gdb_get_line_number "end ${function}_test "]
set start [gdb_get_line_number "start ${function}_test"]
gdb_breakpoint $start temporary
gdb_breakpoint $end temporary
gdb_breakpoint $start -temporary
gdb_breakpoint $end -temporary
gdb_continue_to_breakpoint "start ${function}_test"
if {[supports_process_record]} {

4
gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp
View file

@ -65,7 +65,7 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
gdb_test_no_output "set follow-fork-mode ${follow-fork-mode}"
if { ${follow-fork-mode} == "parent" } {
runto break_here_execer allow-pending message
runto break_here_execer -allow-pending -message
gdb_continue_to_end "continue parent to end" "continue" 1
if { ${detach-on-fork} == "off" } {
@ -73,7 +73,7 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
gdb_continue_to_end "continue child to end" "continue" 1
}
} elseif { ${follow-fork-mode} == "child" } {
runto break_here_execee allow-pending message
runto break_here_execee -allow-pending -message
gdb_continue_to_end "continue child to end" "continue" 1
if { ${detach-on-fork} == "off" } {

4
gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp
View file

@ -62,7 +62,7 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
gdb_test_no_output "set follow-fork-mode ${follow-fork-mode}"
if { ${follow-fork-mode} == "parent" } {
runto break_here_execer allow-pending message
runto break_here_execer -allow-pending -message
gdb_continue_to_end "continue parent to end" "continue" 1
if { ${detach-on-fork} == "off" } {
@ -70,7 +70,7 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
gdb_continue_to_end "continue child to end" "continue" 1
}
} elseif { ${follow-fork-mode} == "child" } {
runto break_here_execee allow-pending message
runto break_here_execee -allow-pending -message
gdb_continue_to_end "continue child to end" "continue" 1
if { ${detach-on-fork} == "off" } {

2
gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp
View file

@ -36,7 +36,7 @@ proc do_test {} {
with_rocm_gpu_lock {
gdb_breakpoint [gdb_get_line_number "Break here"]
gdb_breakpoint kern allow-pending
gdb_breakpoint kern -allow-pending
gdb_breakpoint [gdb_get_line_number "Last break here"]
# Run until we reach the first breakpoint where we can figure

2
gdb/testsuite/gdb.rocm/precise-memory-warning-watchpoint.exp
View file

@ -35,7 +35,7 @@ proc do_test { } {
gdb_load $::binfile
with_rocm_gpu_lock {
if {![runto kernel allow-pending qualified]} {
if {![runto kernel -allow-pending -qualified]} {
fail "can't run to main"
return
}

2
gdb/testsuite/gdb.rocm/precise-memory.exp
View file

@ -63,7 +63,7 @@ proc do_test { } {
# Get to the beginning of the GPU kernel without precise memory enabled.
with_test_prefix "goto gpu code" {
gdb_test_no_output "set amdgpu precise-memory off"
gdb_breakpoint "kernel" allow-pending
gdb_breakpoint "kernel" -allow-pending
gdb_test "continue" "Thread ${::decimal}.* hit Breakpoint .*"
gdb_test_no_output "set amdgpu precise-memory on"
}

2
gdb/testsuite/gdb.rocm/watchpoint-at-end-of-shader.exp
View file

@ -53,7 +53,7 @@ proc do_test {precise_memory has_xfail} {
gdb_load $::binfile
with_rocm_gpu_lock {
if {![runto [gdb_get_line_number "Break here."] allow-pending]} {
if {![runto [gdb_get_line_number "Break here."] -allow-pending]} {
return
}

2
gdb/testsuite/gdb.rocm/watchpoint-basic.exp
View file

@ -118,7 +118,7 @@ proc_with_prefix test_watchpoint_inside_kernel {} {
return
}
gdb_breakpoint "kernel" allow-pending temporary
gdb_breakpoint "kernel" -allow-pending -temporary
gdb_test "continue" \
"hit Temporary breakpoint.*, kernel .*" \
"continue to kernel"

4
gdb/testsuite/gdb.rust/modules.exp
View file

@ -85,8 +85,8 @@ foreach mod {mod1::inner::innest mod1::inner mod1 {}} {
if {$mod != ""} {
append mod ::
}
gdb_breakpoint modules::${mod}f2 message
gdb_breakpoint "*::${mod}f2" message
gdb_breakpoint modules::${mod}f2 -message
gdb_breakpoint "*::${mod}f2" -message
}
gdb_test "print ::TWENTY_THREE" " = 23"

2
gdb/testsuite/gdb.threads/del-pending-thread-bp.exp
View file

@ -56,7 +56,7 @@ gdb_continue_to_breakpoint "first breakpt call"
gdb_test "info threads" "\r\n\\s+2\\s+\[^\r\n\]+"
# Create a pending, thread-specific, breakpoint on 'foo'.
gdb_breakpoint "foo thread 2" allow-pending
gdb_breakpoint "foo thread 2" -allow-pending
set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \
"get breakpoint number"]

4
gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
View file

@ -127,7 +127,7 @@ proc detach_and_expect_exit {inf_output_re test} {
# Run to _exit in the child.
proc continue_to_exit_bp {} {
gdb_breakpoint "_exit" temporary
gdb_breakpoint "_exit" -temporary
return [gdb_continue_to_breakpoint "_exit" ".*_exit.*"]
}
@ -254,7 +254,7 @@ proc test_detach_watch {wp multi_process cmd} {
gdb_test_no_output "set detach-on-fork off"
gdb_test_no_output "set follow-fork-mode child"
gdb_breakpoint "child_function" temporary
gdb_breakpoint "child_function" -temporary
gdb_continue_to_breakpoint "child_function" ".*"
}

2
gdb/testsuite/gdb.trace/actions-changed.exp
View file

@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
}
proc test_actions_changed { } {
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "trace subr" "Tracepoint .*" \
"tracepoint at subr"

2
gdb/testsuite/gdb.trace/backtrace.exp
View file

@ -146,7 +146,7 @@ gdb_trace_setactions "8.6: setup TP to collect stack mem cast expr" \
gdb_test_no_output "tstart" ""
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "continue" \
"Continuing.*Breakpoint $decimal, end.*" \
"run trace experiment"

4
gdb/testsuite/gdb.trace/circ.exp
View file

@ -66,7 +66,7 @@ proc run_trace_experiment { } {
global decimal
setup_tracepoints
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "tstart" "\[\r\n\]*" "start trace experiment"
gdb_test "continue" "Continuing.*Breakpoint ${::decimal}, end.*" \
"run to end"
@ -187,7 +187,7 @@ set frame_size -1
with_test_prefix "frame size" {
set_a_tracepoint func0
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "tstart" "\[\r\n\]*" "start trace"

4
gdb/testsuite/gdb.trace/collection.exp
View file

@ -62,8 +62,8 @@ proc prepare_for_trace_test {} {
runto_main
gdb_breakpoint "begin" qualified
gdb_breakpoint "end" qualified
gdb_breakpoint "begin" -qualified
gdb_breakpoint "end" -qualified
}
proc run_trace_experiment { test_func } {

4
gdb/testsuite/gdb.trace/disconnected-tracing.exp
View file

@ -60,7 +60,7 @@ proc disconnected_tracing { } {
gdb_test "trace start" ".*"
gdb_trace_setactions "collect on tracepoint 2" "2" \
"collect foo" "^$"
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test_no_output "tstart"
@ -122,7 +122,7 @@ proc disconnected_tfind { } {
gdb_test "trace start" ".*"
gdb_test_no_output "tstart"
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*"
gdb_test_no_output "tstop"

4
gdb/testsuite/gdb.trace/ftrace-lock.exp
View file

@ -68,8 +68,8 @@ if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 }
return 1
}
gdb_breakpoint "end" qualified
gdb_breakpoint "fail" qualified
gdb_breakpoint "end" -qualified
gdb_breakpoint "fail" -qualified
gdb_test "ftrace set_point" "Fast tracepoint .*" \
"fast tracepoint at a long insn"

4
gdb/testsuite/gdb.trace/ftrace.exp
View file

@ -107,9 +107,9 @@ proc test_fast_tracepoints {} {
set fourgood 0
gdb_breakpoint "begin" qualified
gdb_breakpoint "begin" -qualified
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "print gdb_agent_gdb_trampoline_buffer_error" ".*" ""

2
gdb/testsuite/gdb.trace/infotrace.exp
View file

@ -107,7 +107,7 @@ if {![gdb_target_supports_trace]} {
return 1
}
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test_no_output "tstart"
gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \
"continue to end"

2
gdb/testsuite/gdb.trace/packetlen.exp
View file

@ -58,7 +58,7 @@ gdb_trace_setactions "setup collect actions" \
"end" ""
gdb_test_no_output "tstart" "survive the long packet send"
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "continue" \
"Continuing.*Breakpoint $decimal, end.*" \
"run trace experiment"

2
gdb/testsuite/gdb.trace/passc-dyn.exp
View file

@ -82,7 +82,7 @@ gdb_test "passcount 3 $tdp4" "Setting tracepoint $tdp4's passcount to 3" \
gdb_test "tstart" ".*" ""
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "continue" \
"Continuing.*Breakpoint $decimal, end.*" \
"run trace experiment"

2
gdb/testsuite/gdb.trace/qtro.exp
View file

@ -45,7 +45,7 @@ if {![gdb_target_supports_trace]} {
# frame (IOW, returns while tfind mode is active).
proc prepare_for_trace_disassembly { } {
global gdb_prompt
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "trace subr" "Tracepoint .*" \
"tracepoint at subr"

2
gdb/testsuite/gdb.trace/read-memory.exp
View file

@ -40,7 +40,7 @@ proc set_tracepoint_and_collect { } {
if {![runto_main]} {
return -1
}
gdb_breakpoint "end" qualified
gdb_breakpoint "end" -qualified
gdb_test "trace start" "Tracepoint \[0-9\] at .*"
gdb_trace_setactions "set action for tracepoint" "" \
"collect testglob" "^$" \

Some files were not shown because too many files have changed in this diff Show more