mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-12 12:16:04 +08:00
cce0ae568c
The previous patch to add -prompt/-lbl to gdb_test introduced a regression: Before, you could specify an explicit empty message to indicate you didn't want to PASS, like so: gdb_test COMMAND PATTERN "" After said patch, gdb_test no longer distinguishes no-message-specified vs empty-message, so tests that previously would be silent on PASS, now started emitting PASS messages based on COMMAND. This in turn introduced a number of PATH/DUPLICATE violations in the testsuite. This commit fixes all the regressions I could see. This patch uses the new -nopass feature introduced in the previous commit, but tries to avoid it if possible. Most of the patch fixes DUPLICATE issues the usual way, of using with_test_prefix or explicit unique messages. See previous commit's log for more info. In addition to looking for DUPLICATEs, I also looked for cases where we would now end up with an empty message in gdb.sum, due to a gdb_test being passed both no message and empty command. E.g., this in gdb.ada/bp_reset.exp: gdb_run_cmd gdb_test "" "Breakpoint $decimal, foo\\.nested_sub \\(\\).*" was resulting in this in gdb.sum: PASS: gdb.ada/bp_reset.exp: I fixed such cases by passing an explicit message. We may want to make such cases error out. Tested on x86_64 GNU/Linux, native and native-extended-gdbserver. I see zero PATH cases now. I get zero DUPLICATEs with native testing now. I still see some DUPLICATEs with native-extended-gdbserver, but those were preexisting, unrelated to the gdb_test change. Change-Id: I5375f23f073493e0672190a0ec2e847938a580b2
76 lines
1.9 KiB
Plaintext
76 lines
1.9 KiB
Plaintext
# Copyright 2013-2022 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/>.
|
|
|
|
# Execute command CMD and check that GDB sends the expected number of
|
|
# vCont;r packet. Returns 0 if the test passes, otherwise returns 1.
|
|
|
|
proc exec_cmd_expect_vCont_count { cmd exp_vCont_r } {
|
|
global gdb_prompt
|
|
|
|
gdb_test_no_output -nopass "set debug remote 1"
|
|
|
|
set test "${cmd}: vCont;r=${exp_vCont_r}"
|
|
set r_counter 0
|
|
set s_counter 0
|
|
set ret 1
|
|
set any {[^\r\n]*}
|
|
gdb_test_multiple $cmd $test {
|
|
-re "vCont;s${any}\r\n" {
|
|
incr s_counter
|
|
exp_continue
|
|
}
|
|
-re "vCont;r${any}\r\n" {
|
|
incr r_counter
|
|
exp_continue
|
|
}
|
|
-re "\r\n" {
|
|
# Prevent overflowing the expect buffer.
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
if { $r_counter == ${exp_vCont_r} } {
|
|
pass $test
|
|
set ret 0
|
|
} else {
|
|
fail $test
|
|
}
|
|
}
|
|
}
|
|
|
|
gdb_test_no_output -nopass "set debug remote 0"
|
|
return $ret
|
|
}
|
|
|
|
# Check whether range stepping is supported by the target.
|
|
|
|
proc gdb_range_stepping_enabled { } {
|
|
global gdb_prompt
|
|
|
|
set command "set range-stepping on"
|
|
set message "probe range-stepping support"
|
|
gdb_test_multiple $command $message {
|
|
-re "Range stepping is not supported.*\r\n$gdb_prompt $" {
|
|
pass $message
|
|
return 0
|
|
}
|
|
-re "^$command\r\n$gdb_prompt $" {
|
|
pass $message
|
|
return 1
|
|
}
|
|
}
|
|
|
|
return 0
|
|
}
|