From e777225bfd79e0667ba7105f1f9f8375a6abc034 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 3 Sep 2020 15:38:12 +0100 Subject: gdb/testsuite/: Use "-qualified" in explicit "break main", etc. Similar to the previous patch, but this time add "-q" to tests that do "break main", "list main", etc. explicitly. gdb/testsuite/ChangeLog: * config/monitor.exp: Use "list -q". * gdb.arch/gdb1558.exp: Use "break -q". * gdb.arch/i386-permbkpt.exp: Use "break -q". * gdb.arch/i386-prologue-skip-cf-protection.exp: Use "break -q". * gdb.base/break.exp: Use "break -q", "list -q" and "tbreak -q". * gdb.base/commands.exp: Use "break -q". * gdb.base/condbreak.exp: Use "break -q". * gdb.base/ctf-ptype.exp: Use "list -q". * gdb.base/define.exp: Use "break -q". * gdb.base/del.exp: Use "break -q". * gdb.base/fullname.exp: Use "break -q". * gdb.base/hbreak-in-shr-unsupported.exp: Use "hbreak -q". * gdb.base/hbreak-unmapped.exp: Use "hbreak -q". * gdb.base/hbreak2.exp: Use "hbreak -q" and "list -q". * gdb.base/hw-sw-break-same-address.exp: Use "break -q" and "hbreak -q". * gdb.base/included.exp: Use "list -q". * gdb.base/label.exp: Use "break -q". * gdb.base/lineinc.exp: Use "break -q". * gdb.base/list.exp: Use "list -q". * gdb.base/macscp.exp: Use "list -q". * gdb.base/pending.exp: Use "break -q". * gdb.base/prologue-include.exp: Use "break -q". * gdb.base/ptype.exp: Use "list -q". * gdb.base/sepdebug.exp: Use "break -q", "list -q" and "tbreak -q". * gdb.base/server-del-break.exp: Use "break -q". * gdb.base/style.exp: Use "break -q". * gdb.base/symbol-without-target_section.exp: Use "list -q". * gdb.base/watchpoint-reuse-slot.exp: Use "hbreak -q". * gdb.cp/exception.exp: Use "tbreak -q". * gdb.dwarf2/dw2-error.exp: Use "break -q". * gdb.dwarf2/fission-mix.exp: Use "break -q". * gdb.dwarf2/fission-reread.exp: Use "break -q". * gdb.dwarf2/pr13961.exp: Use "break -q". * gdb.linespec/explicit.exp: Use "list -q". * gdb.linespec/linespec.exp: Use "break -q". * gdb.mi/mi-simplerun.exp: Use "--qualified". * gdb.python/py-mi-objfile-gdb.py: Use "list -q". * gdb.server/bkpt-other-inferior.exp: Use "break -q". * gdb.server/connect-without-multi-process.exp: Use "break -q". * gdb.trace/change-loc.exp: Use "break -q". * gdb.trace/pending.exp: Use "break -q". * gdb.tui/basic.exp: Use "list -q". * gdb.tui/list-before.exp: Use "list -q". * gdb.tui/list.exp: Use "list -q". * lib/gdb.exp (gdb_has_argv0): Use "break -q". Change-Id: Iab9408e90ed71cbb111cd737d2d81b5ba8adb108 --- gdb/testsuite/gdb.arch/gdb1558.exp | 6 +++--- gdb/testsuite/gdb.arch/i386-permbkpt.exp | 4 ++-- gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gdb/testsuite/gdb.arch') diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp index 47b64cf..9748e2e 100644 --- a/gdb/testsuite/gdb.arch/gdb1558.exp +++ b/gdb/testsuite/gdb.arch/gdb1558.exp @@ -41,9 +41,9 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "b main" "Breakpoint 1.*" "set breakpoint at main" -gdb_test "b sub1" "Breakpoint 2.*" "set breakpoint at sub1" -gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint at sub2" +gdb_test "b -q main" "Breakpoint 1.*" "set breakpoint at main" +gdb_test "b -q sub1" "Breakpoint 2.*" "set breakpoint at sub1" +gdb_test "b -q sub2" "Breakpoint 3.*" "set breakpoint at sub2" # We can't use "runto_main" because that is exactly the problem # we are trying to detect, stopping somewhere before main. diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp index e9aadef..7dc2a87 100644 --- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp +++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp @@ -35,5 +35,5 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} -gdb_test "break main" "" "first permanent break" -gdb_test "break main" "" "second permanent break" +gdb_test "break -q main" "" "first permanent break" +gdb_test "break -q main" "" "second permanent break" diff --git a/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp b/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp index 9ba64f9..c38c7ce 100644 --- a/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp +++ b/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp @@ -48,7 +48,7 @@ gdb_assert {$main_addr != -1} set bp_addr -1 # Put breakpoint on main, get the address where the breakpoint was installed. -gdb_test_multiple "break main" "break on main, get address" { +gdb_test_multiple "break -q main" "break on main, get address" { -re -wrap "Breakpoint $decimal at ($hex).*" { set bp_addr $expect_out(1,string) -- cgit v1.1