e2f620135d
This commit makes two changes to how we match newline characters in the gdb_test proc. First, for the newline pattern between the command output and the prompt, I propose changing from '[\r\n]+' to an explicit '\r\n'. The old pattern would spot multiple newlines, and so there are a few places where, as part of this commit, I've needed to add an extra trailing '\r\n' to the pattern in the main test file, where GDB's output actually includes a blank line. But I think this is a good thing. If a command produces a blank line then we should be checking for it, the current gdb_test doesn't do that. But also, with the current gdb_test, if a blank line suddenly appears in the output, this is going to be silently ignored, and I think this is wrong, the test should fail in that case. Additionally, the existing pattern will happily match a partial newline. There are a strangely large number of tests that end with a random '.' character. Not matching a literal period, but matching any single character, this is then matching half of the trailing newline sequence, while the \[\r\n\]+ in gdb_test is matching the other half of the sequence. I can think of no reason why this would be intentional, I suspect that the expected output at one time included a period, which has since been remove, but I haven't bothered to check on this. In this commit I've removed all these unneeded trailing '.' characters. The basic rule of gdb_test after this is that the expected pattern needs to match everything up to, but not including the newline sequence immediately before the GDB prompt. This is generally how the proc is used anyway, so in almost all cases, this commit represents no significant change. Second, while I was cleaning up newline matching in gdb_test, I've also removed the '[\r\n]*' that was added to the start of the pattern passed to gdb_test_multiple. The addition of this pattern adds no value. If the user pattern matches at the start of a line then this would match against the newline sequence. But, due to the '*', if the user pattern doesn't match at the start of a line then this group doesn't care, it'll happily match nothing. As such, there's no value to it, it just adds more complexity for no gain, so I'm removing it. No tests will need updating as a consequence of this part of the patch. Reviewed-By: Tom Tromey <tom@tromey.com>
75 lines
2.4 KiB
Text
75 lines
2.4 KiB
Text
# Copyright 2003-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/>. */
|
|
|
|
# until.exp -- Expect script to test 'until' in gdb
|
|
|
|
set srcfile break.c
|
|
if { [prepare_for_testing "failed to prepare" "until" {break.c break1.c} {debug nowarnings}] } {
|
|
return -1
|
|
}
|
|
|
|
set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
|
|
set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
|
|
set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
|
|
set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
|
|
|
|
if {![runto_main]} {
|
|
return 0
|
|
}
|
|
|
|
# Verify that "until <location>" works. (This is really just syntactic
|
|
# sugar for "tbreak <location>; continue".)
|
|
#
|
|
gdb_test "until $bp_location1" \
|
|
"main .* at .*:$bp_location1.*" \
|
|
"until line number"
|
|
|
|
# Verify that a malformed "advance" is gracefully caught.
|
|
#
|
|
gdb_test "until 80 then stop" \
|
|
"malformed linespec error: unexpected string, \"then stop\"" \
|
|
"malformed until"
|
|
|
|
# Rerun up to factorial, outer invocation
|
|
if { ![runto factorial] } {
|
|
return
|
|
}
|
|
|
|
delete_breakpoints
|
|
|
|
# At this point, 'until' should continue the inferior up to when all the
|
|
# inner invocations of factorial() are completed and we are back at this
|
|
# frame.
|
|
#
|
|
gdb_test "until $bp_location19" \
|
|
"factorial.*value=720.*at.*${srcfile}:$bp_location19.*return \\(value\\).*" \
|
|
"until factorial, recursive function"
|
|
|
|
# Run to a function called by main
|
|
#
|
|
if { ![runto marker2] } {
|
|
return
|
|
}
|
|
|
|
delete_breakpoints
|
|
|
|
# Now issue an until with another function, not called by the current
|
|
# frame, as argument. This should not work, i.e. the program should
|
|
# stop at main, the caller, where we put the 'guard' breakpoint.
|
|
#
|
|
gdb_test "until marker3" \
|
|
"($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:($bp_location20.*marker2 \\(43\\)|$bp_location21.*marker3 \\(.stack., .trace.\\)).*" \
|
|
"until func, not called by current frame"
|
|
|