Files
binutils-gdb/gdb/testsuite/gdb.base/new-ui-pending-input.exp
Tom de Vries bc37aacde1 [gdb/testsuite] Fix gdb.base/new-ui-pending-input.exp timeout
With a testsuite setup modified to make expect wait a little bit longer for
gdb output (see PR27957), I run into:
...
PASS: gdb.base/new-ui-pending-input.exp: spawn gdb
print 1^M
print 2^M
print 3^M
(gdb) $1 = 1^M
(gdb) $2 = 2^M
(gdb) $3 = 3^M
(gdb) PASS: gdb.base/new-ui-pending-input.exp: initial prompt on extra console
^M
Breakpoint 1, main () at new-ui-pending-input.c:25^M
25        return 0; /* set breakpoint here */^M
FAIL: gdb.base/new-ui-pending-input.exp: print 1 on extra console (timeout)
...

Usually, I get a pass instead.  In the passing case, the "initial prompt"
PASS is after the first prompt:
...
PASS: gdb.base/new-ui-pending-input.exp: spawn gdb
print 1^M
print 2^M
print 3^M
(gdb) PASS: gdb.base/new-ui-pending-input.exp: initial prompt on extra console
...
while in the failing case, that PASS is after the fourth prompt.

The regexp doesn't match the first prompt because it terminates with a '$':
...
           -re "$gdb_prompt $" {
...

Fix this by removing the terminating '$' and prefixing the regex with
something unique to the first prompt: "print 3".

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-06-07  Tom de Vries  <tdevries@suse.de>

	* gdb.base/new-ui-pending-input.exp
	(test_command_line_new_ui_pending_input): Fix regexp for "initial
	prompt on extra console".
2021-06-07 14:33:50 +02:00

124 lines
3.4 KiB
Plaintext

# Copyright 2016-2021 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/>.
# Test 'gdb "-ex new-ui TTY" -ex "start"' (or any other synchronous
# execution command), when TTY already has input pending. GDB used to
# internal error in this situation.
standard_testfile
set compile_options "debug"
if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
untested "failed to compile"
return -1
}
# See intro.
proc test_command_line_new_ui_pending_input {} {
global gdb_prompt
global binfile
# This test requires running a synchronous execution command from
# the command line.
if {[use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } {
unsupported "can't run from the command line"
return 0
}
spawn -pty
set extra_spawn_id $spawn_id
set extra_tty_name $spawn_out(slave,name)
# An arbitrary number of prints.
set nprints 3
# Queue a few commands before GDB is started.
with_spawn_id $extra_spawn_id {
for {set i 1} {$i <= $nprints} {incr i} {
send_gdb "print $i\n"
}
}
pass "commands pending"
# Now spawn GDB, creating a new-ui and at the same time running a
# synchronous command.
set test "spawn gdb"
set bpline [gdb_get_line_number "set breakpoint here"]
set options ""
append options " -iex \"set height 0\""
append options " -iex \"set width 0\""
append options " -iex \"new-ui console $extra_tty_name\""
append options " -ex \"b $bpline\""
append options " -ex \"run\""
if {[gdb_spawn_with_cmdline_opts "$options $binfile"] != 0} {
fail $test
return
} else {
pass $test
}
# Consume the initial prompt on the extra console.
with_spawn_id $extra_spawn_id {
set test "initial prompt on extra console"
gdb_test_multiple "" $test {
-re "\r\nprint 3\r\n$gdb_prompt " {
pass $test
}
}
}
# Check that we see the result of the print commands in the extra
# UI.
with_spawn_id $extra_spawn_id {
for {set i 1} {$i <= $nprints} {incr i} {
set test "print $i on extra console"
gdb_test_multiple "" $test {
-re " = $i\r\n$gdb_prompt " {
pass "$test"
}
}
}
}
# Now check that we reach the breakpoint successfully.
set test "run to breakpoint on main console"
gdb_test_multiple "" $test {
-re "Breakpoint .* main .*set breakpoint here.*$gdb_prompt $" {
pass $test
}
}
# And likewise on the extra console. No prompt is expected.
with_spawn_id $extra_spawn_id {
set test "run to breakpoint on extra console"
gdb_test_multiple "" $test {
-re "Breakpoint .* main .*set breakpoint here" {
pass $test
}
}
}
}
# The driver. Calls all tests.
proc testcase_driver {} {
test_command_line_new_ui_pending_input
}
testcase_driver