Files
binutils-gdb/gdb/testsuite/gdb.base/watch_thread_num.exp
Andrew Burgess 25902bd0ba gdb/testsuite: make more use of clean_restart's argument
Commits:

  commit aaad5a3254
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 3

  commit 2e61486fce
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 2

  commit 202beb3fee
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 1

were made to work around the changes to clean_restart in commit:

  commit cba778b944
  Date:   Sun Sep 7 11:53:30 2025 +0200

      [gdb/testsuite] Error out on clean_restart <absolute filename>

These commits added a lot of calls to gdb_load which can be removed in
many cases by passing $testfile to clean_restart, or by switching to
use prepare_for_testing to compile the test executable.

In this commit I've gone through the gdb.base/ directory and removed
as many of the gdb_load calls as possible.  I was only looking for
places where the gdb_load call immediately follows the call to
clean_restart.  And I did skip a few where it was not as simple as
just passing $testfile.

Where possible I've updated tests to use calls to prepare_for_testing,
and simply removed the clean_restart call altogether (this is done as
part of prepare_for_testing).  This is, I think, the best solution.

In other cases I've removed the gdb_load call, and passed $testfile to
clean_restart.  I've preferred $::testfile to adding a 'global'
declaration, and in some cases switching to testfile has allowed me to
remove the 'global binfile' as an additional cleanup.

I ran the complete set of tests that I touched and I didn't see any
regressions, so I don't believe I broke anything.

I know that there are probably gdb_load calls that can be cleaned up
in other testsuite sub-directories, if/when this patch is merged I'll
take a look at those too.

Reviewed-By: Tom de Vries <tdevries@suse.de>
2025-12-01 14:00:47 +00:00

101 lines
3.1 KiB
Plaintext

# This testcase is part of GDB, the GNU debugger.
# Copyright 2007-2025 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. */
# watch-thread_num.exp Test thread <thread_num> parameter for
# watch commands.
#
# This test verifies that a watchpoint is detected in the proper thread
# so the test is only meaningful on a system with hardware watchpoints.
# More specifically, the implementation of this test uses access
# watchpoints, so skip it when those are not available.
require allow_hw_watchpoint_access_tests
standard_testfile .c
if { [prepare_for_testing "prepare" $testfile $srcfile {debug pthreads}] != 0 } {
return
}
if {![runto_main]} {
return
}
gdb_test "watch shared_var thread 0" "Invalid thread ID: 0" "watchpoint on invalid thread"
gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "invalid watch syntax"
set bpexitline [gdb_get_line_number "all threads started"]
gdb_breakpoint "$bpexitline"
gdb_continue_to_breakpoint "all threads started"
gdb_test "break loop" "Breakpoint \[0-9\].*" \
"Set breakpoint at loop"
gdb_test "continue" ".*Breakpoint .*loop.*" "stopped in loop"
gdb_test_multiple "thread" "thread command" {
-re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
pass "thread command"
}
}
set thread_num "$expect_out(1,string)"
delete_breakpoints
# We use an access watchpoint rather than a write watchpoint, because
# GDB can drop the latter when multiple threads trigger events
# simultaneously, on targets with continuable watchpoints, such as
# x86. See PR breakpoints/10116.
gdb_test "awatch shared_var thread $thread_num" \
"Hardware access \\(read/write\\) watchpoint .*: shared_var.*" \
"watchpoint on shared variable"
gdb_test "info breakpoint \$bpnum" \
"stop only in thread $thread_num" \
"info breakpoint shows watchpoint is thread-specific"
# Uncomment to see additional information.
#gdb_test "set debug infrun 1"
for {set i 1} {$i <= 5} {incr i} {
set watchpoint "Watchpoint triggered iteration $i"
set check "Check thread that triggered iteration $i"
set test $watchpoint
set seen_watchpoint 0
gdb_test_multiple "continue" $test {
-re "Hardware access \\(read/write\\) watchpoint .*: shared_var" {
set seen_watchpoint 1
exp_continue
}
-re "$gdb_prompt " {
if { $seen_watchpoint } {
pass $test
} else {
fail $test
}
}
-re "\\\[infrun\\\] " {
# Avoid timeouts when debugging GDB.
exp_continue
}
}
gdb_test "thread" ".*Current thread is $thread_num .*" $check
}