Files
binutils-gdb/gdb/testsuite/gdb.base/attach-wait-input.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

116 lines
3.0 KiB
Plaintext

# Copyright 2014-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/>. */
# Verify that GDB waits for the "attach" command to finish before
# processing the following command.
#
# GDB used to have a race where on async targets, in the small window
# between the attach request and the initial stop for the attach, GDB
# was still processing user input.
#
# The issue was originally detected with:
#
# echo -e "attach PID\nset xxx=1" | gdb
#
# In that scenario, stdin is not a tty, which disables readline.
# Explicitly turning off editing exercises the same code path, and is
# simpler to do, so we test with both editing on and off.
# The test uses the "attach" command.
require !use_gdb_stub
standard_testfile
if {[build_executable "failed to build" $testfile $srcfile debug]} {
return -1
}
# Start the program running, and return its PID, ready for attaching.
proc start_program {testfile} {
global gdb_prompt
global decimal
clean_restart $testfile
if {![runto setup_done]} {
return 0
}
# Get the PID of the test process.
set testpid ""
set test "get inferior process ID"
gdb_test_multiple "p mypid" $test {
-re " = ($decimal)\r\n$gdb_prompt $" {
set testpid $expect_out(1,string)
pass $test
}
}
gdb_test "detach" "Detaching from program: .*"
if {$testpid == ""} {
return
}
return $testpid
}
# Do test proper. EDITING indicates whether "set editing" is on or
# off.
proc test { editing } {
global gdb_prompt
global decimal
with_test_prefix "editing $editing" {
set testpid [start_program $::testfile]
if {$testpid == ""} {
return
}
# Enable/disable readline.
gdb_test_no_output "set editing $editing"
# Send both commands at once.
send_gdb "attach $testpid\nprint should_exit = 1\n"
# Use gdb_expect directly instead of gdb_test_multiple to
# avoid races with the double prompt.
set test "attach and print"
gdb_expect {
-re "Attaching to program.*process $testpid\r\n.*$gdb_prompt.*$decimal = 1\r\n$gdb_prompt $" {
pass "$test"
}
timeout {
fail "$test (timeout)"
}
}
# As we've used attach, on quit, we'll detach from the
# program. Explicitly kill it in case we failed above.
gdb_test "kill" \
"" \
"after attach, exit" \
"Kill the program being debugged.*y or n. $" \
"y"
}
}
foreach editing {"on" "off"} {
test $editing
}