Files
binutils-gdb/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.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

78 lines
2.1 KiB
Plaintext

# Copyright (C) 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/>.
require {!target_info exists gdb,nointerrupts}
standard_testfile
if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
return -1
}
# Send a ctrl-c while the target is running and check that the output
# does not cause a pagination prompt.
proc test_ctrlc_while_target_running_does_not_paginate {} {
global srcfile
global gdb_prompt
set testline [gdb_get_line_number "after sleep"]
with_test_prefix "ctrlc target running" {
clean_restart $::testfile
if {![runto_main]} {
return 0
}
gdb_test "b $srcfile:$testline" \
"Breakpoint .*$srcfile, line $testline.*" \
"set breakpoint"
gdb_test_no_output "set height 2"
# Wait for the "Continuing" line, indicating the program is
# running.
set test "continue"
gdb_test_multiple $test $test {
-re "Continuing" {
pass $test
}
}
# The program sleeps 10 seconds. Wait just a bit and send a
# ctrl-c.
sleep 2
send_gdb "\003"
# GDB now intercepts the SIGINT and tries to let the user know
# about the spurious signal. Make sure that this does not
# trigger pagination.
gdb_test_multiple "" "no pagination" {
-re "$gdb_prompt $" {
pass $gdb_test_name
}
}
# Confirm GDB can still process input.
gdb_test "p 1" " = 1" "GDB accepts further input"
# In case the board file wants to send further commands.
gdb_test_no_output "set height unlimited"
}
}
test_ctrlc_while_target_running_does_not_paginate