forked from Imagelibrary/binutils-gdb
08ec06d644
In this commit I propose that we add special handling for the '^' when
used at the start of a gdb_test pattern. Consider this usage:
gdb_test "some_command" "^command output pattern"
I think the intention here is pretty clear - run 'some_command', and
the output from the command should be exactly 'command output
pattern'.
After the previous commit which tightened up how gdb_test matches the
final newline and prompt we know that the only thing after the output
pattern will be a single newline and prompt, and the leading '^'
ensures that there's no output before 'command output pattern', so
this will do what I want, right?
... except it doesn't. The command itself will also needs to be
matched, so I should really write:
gdb_test "some_command" "^some_command\r\ncommand output pattern"
which will do what I want, right? Well, that's fine until I change
the command and include some regexp character, then I have to write:
gdb_test "some_command" \
"^[string_to_regexp some_command]\r\ncommand output pattern"
but this all gets a bit verbose, so in most cases I simply don't
bother anchoring the output with a '^', and a quick scan of the
testsuite would indicate that most other folk don't both either.
What I propose is this: the *only* thing that can appear immediately
after the '^' is the command converted into a regexp, so lets do that
automatically, moving the work into gdb_test. Thus, when I write:
gdb_test "some_command" "^command output pattern"
Inside gdb_test we will spot the leading '^' in the pattern, and
inject the regexp version of the command after the '^', followed by a
'\r\n'.
My hope is that given this new ability, folk will be more inclined to
anchor their output patterns when this makes sense to do so. This
should increase our ability to catch any unexpected output from GDB
that appears as a result of running a particular command.
There is one problem case we need to consider, sometime people do
this:
gdb_test "" "^expected output pattern"
In this case no command is sent to GDB, but we are still expecting
some output from GDB. This might be a result of some asynchronous
event for example. As there is no command sent to GDB (from the
gdb_test) there will be no command text to parse.
In this case my proposed new feature injects the command regexp, which
is the empty string (as the command itself is empty), but still
injects the '\r\n' after the command regexp, thus we end up with this
pattern:
^\r\nexpected output pattern
This extra '\r\n' is not what we should expected here, and so there is
a special case inside gdb_test -- if the command is empty then don't
add anything after the '^' character.
There are a bunch of tests that do already use '^' followed by the
command, and these can all be simplified in this commit.
I've tried to run all the tests that I can to check this commit, but I
am certain that there will be some tests that I manage to miss.
Apologies for any regressions this commit causes, hopefully fixing the
regressions will not be too hard.
Reviewed-By: Tom Tromey <tom@tromey.com>
128 lines
3.8 KiB
Plaintext
128 lines
3.8 KiB
Plaintext
# Copyright 2016-2023 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/>.
|
|
|
|
# Regression test for PR 20494 (User input stops being echoed in CLI).
|
|
# Before that bug was fixed, starting an inferior in a non-main UI
|
|
# would result in GDB saving readline's prepped terminal state as
|
|
# gdb's "own" terminal state (i.e., target_terminal_ours state),
|
|
# resulting in subsequent synchronous execution commands in the main
|
|
# UI disabling input echo.
|
|
|
|
standard_testfile
|
|
|
|
set compile_options "debug"
|
|
if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
|
|
untested "failed to compile"
|
|
return -1
|
|
}
|
|
|
|
# Start gdb and create an extra console UI. Start the inferior in the
|
|
# DRIVER console (either "main" or "extra"), and then enter a
|
|
# synchronous execution command in the extra console. Before PR 20494
|
|
# was fixed, if DRIVER was a secondary UI, GDB would lose input echo
|
|
# on the main UI after the synchronous execution command. We test
|
|
# with both main and extra UIs as driver consoles for completeness.
|
|
|
|
proc echo_test {driver} {
|
|
global srcfile testfile
|
|
global gdb_prompt
|
|
global gdb_spawn_id
|
|
global gdb_main_spawn_id extra_spawn_id
|
|
global decimal
|
|
|
|
clean_restart $testfile
|
|
|
|
# Save the main UI's spawn ID.
|
|
set gdb_main_spawn_id $gdb_spawn_id
|
|
|
|
# Create the new PTY for the secondary console UI.
|
|
spawn -pty
|
|
set extra_spawn_id $spawn_id
|
|
set extra_tty_name $spawn_out(slave,name)
|
|
gdb_test_multiple "new-ui console $extra_tty_name" "new-ui" {
|
|
-re "New UI allocated\r\n$gdb_prompt $" {
|
|
}
|
|
}
|
|
|
|
with_spawn_id $extra_spawn_id {
|
|
set test "initial prompt on extra console"
|
|
gdb_test_multiple "" $test {
|
|
-re "$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
}
|
|
}
|
|
|
|
set main_console [list $gdb_main_spawn_id "main console"]
|
|
set extra_console [list $extra_spawn_id "extra console"]
|
|
|
|
if {$driver == "main"} {
|
|
set con1 $main_console
|
|
set con2 $extra_console
|
|
} else {
|
|
set con1 $extra_console
|
|
set con2 $main_console
|
|
}
|
|
|
|
set con1_spawn_id [lindex $con1 0]
|
|
set con2_spawn_id [lindex $con2 0]
|
|
set con1_name [lindex $con1 1]
|
|
set con2_name [lindex $con2 1]
|
|
|
|
set bp_lineno [gdb_get_line_number "set break $con1_name here"]
|
|
|
|
with_spawn_id $con1_spawn_id {
|
|
gdb_test "break $srcfile:$bp_lineno" \
|
|
"Breakpoint $decimal .*$srcfile, line $bp_lineno\\." \
|
|
"set breakpoint using $con1_name"
|
|
gdb_run_cmd
|
|
gdb_test "" "set break $con1_name here .*" "run to breakpoint on $con1_name"
|
|
}
|
|
|
|
with_spawn_id $con2_spawn_id {
|
|
set test "breakpoint hit reported on $con2_name too"
|
|
gdb_test_multiple "" $test {
|
|
-re "Breakpoint $decimal, .* set break $con1_name here " {
|
|
pass $test
|
|
}
|
|
}
|
|
gdb_test "next" "global = 1;" "next on $con2_name"
|
|
}
|
|
|
|
# Ensure echo remains enabled in both consoles.
|
|
with_spawn_id $con1_spawn_id {
|
|
gdb_test "print 1" "\\\$1 = 1" "print on $con1_name echoes"
|
|
}
|
|
with_spawn_id $con2_spawn_id {
|
|
gdb_test "print 2" "\\\$2 = 2" "print on $con2_name echoes"
|
|
}
|
|
}
|
|
|
|
# The test driver.
|
|
|
|
proc test_driver {} {
|
|
|
|
with_test_prefix "extra console as driver" {
|
|
echo_test "extra"
|
|
}
|
|
|
|
with_test_prefix "main console as driver" {
|
|
echo_test "main"
|
|
}
|
|
|
|
}
|
|
|
|
test_driver
|