c3f814a143
Jan pointed out in <https://sourceware.org/ml/gdb-patches/2014-07/msg00553.html> that these testcases have racy results: gdb.base/double-prompt-target-event-error.exp gdb.base/paginate-after-ctrl-c-running.exp gdb.base/paginate-bg-execution.exp gdb.base/paginate-execution-startup.exp gdb.base/paginate-inferior-exit.exp This is easily reproducible with "read1" from: [reproducer for races of expect incomplete reads] http://sourceware.org/bugzilla/show_bug.cgi?id=12649 The '-notransfer -re "<return>" { exp_continue }' trick in the current tests doesn't actually work. The issue that led to the -notransfer trick was that "---Type <return> to continue, or q <return> to quit---" has two "<return>"s. If one wants gdb_test_multiple to not hit the built-in "<return>" match that results in FAIL, one has to expect the pagination prompt in chunks, first up to the first "<return>", then again, up to the second. Something around these lines: gdb_test_multiple "" $test { -re "<return>" { exp_continue } -re "to quit ---" { pass $test } } The intent was for -notransfer+exp_continue to make expect fetch more input, and rerun the matches against the now potentially fuller buffer, and then eventually the -re that includes the full pagination prompt regex would match instead (because it's listed higher up, it would match first). But, once that "<return>" -notransfer -re matches, it keeps re-matching forever. It seems like with exp_continue, expect immediately retries matching, instead of first reading in more data into the buffer, if available. Fix this like I should have done in the first place. There's actually no good reason for gdb_test_multiple to only match "<return>". We can make gdb_test_multiple expect the whole pagination prompt text instead, which is store in the 'pagination_prompt' global (similar to 'gdb_prompt'). Then a gdb_test_multiple caller that doesn't want the default match to trigger, because it wants to see one pagination prompt, does simply: gdb_test_multiple "" $test { -re "$pagination_prompt$" { pass $test } } which is just like when we don't want the default $gdb_prompt match within gdb_test_multiple to trigger, like: gdb_test_multiple "" $test { -re "$gdb_prompt $" { pass $test } } Tested on x86_64 Fedora 20. In addition, I've let the racy tests run all in parallel in a loop for 30 minutes, and they never failed. gdb/testsuite/ 2014-07-25 Pedro Alves <palves@redhat.com> * gdb.base/double-prompt-target-event-error.exp (cancel_pagination_in_target_event): Remove '-notransfer <return>' match. (cancel_pagination_in_target_event): Rework double prompt detection. * gdb.base/paginate-after-ctrl-c-running.exp (test_ctrlc_while_target_running_paginates): Remove '-notransfer <return>' match. * gdb.base/paginate-bg-execution.exp (test_bg_execution_pagination_return) (test_bg_execution_pagination_cancel): Remove '-notransfer <return>' matches. * gdb.base/paginate-execution-startup.exp (test_fg_execution_pagination_return) (test_fg_execution_pagination_cancel): Remove '-notransfer <return>' matches. * gdb.base/paginate-inferior-exit.exp (test_paginate_inferior_exited): Remove '-notransfer <return>' match. * lib/gdb-utils.exp (string_to_regexp): Move here from lib/gdb.exp. * lib/gdb.exp (pagination_prompt): Run text through string_to_regexp. (gdb_test_multiple): Match $pagination_prompt instead of "<return>". (string_to_regexp): Move to lib/gdb-utils.exp.
83 lines
2.3 KiB
Text
83 lines
2.3 KiB
Text
# Copyright (C) 2014 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/>.
|
|
|
|
standard_testfile
|
|
|
|
if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
|
|
return -1
|
|
}
|
|
|
|
# Send a ctrl-c while the target is running and the next output causes
|
|
# a pagination prompt.
|
|
|
|
proc test_ctrlc_while_target_running_paginates {} {
|
|
global binfile srcfile
|
|
global gdb_prompt pagination_prompt
|
|
|
|
set testline [gdb_get_line_number "after sleep"]
|
|
|
|
with_test_prefix "ctrlc target running" {
|
|
clean_restart $binfile
|
|
|
|
if ![runto_main] then {
|
|
fail "Can't run to 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, but that paginates. Make sure
|
|
# the user can respond to the pagination query.
|
|
set test "got prompt"
|
|
set saw_pagination_prompt 0
|
|
gdb_test_multiple "" $test {
|
|
-re "$pagination_prompt$" {
|
|
set saw_pagination_prompt 1
|
|
send_gdb "\n"
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
gdb_assert $saw_pagination_prompt $test
|
|
}
|
|
}
|
|
|
|
# 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_paginates
|