forked from Imagelibrary/binutils-gdb
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
68 lines
2.2 KiB
Plaintext
68 lines
2.2 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/>.
|
|
|
|
load_lib "ada.exp"
|
|
|
|
if { [skip_ada_tests] } { return -1 }
|
|
|
|
standard_ada_testfile foo
|
|
|
|
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
|
|
return -1
|
|
}
|
|
|
|
clean_restart ${testfile}
|
|
|
|
set ws "\[ \t\r\n\]+"
|
|
|
|
# Start the program in order to have some tasks running...
|
|
set bp_location [gdb_get_line_number "STOP_HERE" ${testdir}/foo.adb]
|
|
gdb_test "break foo.adb:$bp_location" \
|
|
"Breakpoint $decimal.*" \
|
|
|
|
gdb_run_cmd
|
|
gdb_test "" "Breakpoint $decimal, foo \\(\\).*" \
|
|
"run to foo"
|
|
gdb_test "continue" \
|
|
"Continuing\\..*Breakpoint $decimal, foo \\(\\).*"
|
|
|
|
# Make sure that "thread" may be used as a variable without being mistaken
|
|
# for an expression delimiter.
|
|
gdb_test "print thread" \
|
|
"= 1" \
|
|
"print variable 'thread'"
|
|
|
|
gdb_test_no_output "delete 1"
|
|
|
|
gdb_test "watch thread" \
|
|
".*atchpoint \[0-9\]+: thread" \
|
|
"set plain watchpoint on variable 'thread'"
|
|
|
|
# Make sure that 'if' when followed by an expression beginning
|
|
# with 'i' works.
|
|
gdb_test "watch thread if i = 2" \
|
|
".*atchpoint \[0-9\]+: thread" \
|
|
"set conditional watchpoint."
|
|
|
|
gdb_test "info break" \
|
|
".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \
|
|
"check that watchpoint is set correctly."
|
|
|
|
# Check for right error when using both 'if' and 'thread' clauses.
|
|
|
|
gdb_test "break foo.adb:$bp_location if thread = 10 thread 999" \
|
|
".*Unknown thread 999\\." \
|
|
"combination of 'if' and 'thread' delimiters."
|