mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +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
142 lines
3.9 KiB
Plaintext
142 lines
3.9 KiB
Plaintext
# Copyright 1998-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/>.
|
|
|
|
# This file was written by Michael Snyder (msnyder@cygnus.com)
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
standard_testfile actions.c
|
|
if ![gdb_trace_common_supports_arch] {
|
|
unsupported "no trace-common.h support for arch"
|
|
return -1
|
|
}
|
|
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
|
|
executable {debug nowarnings}] != "" } {
|
|
untested "failed to compile"
|
|
return -1
|
|
}
|
|
gdb_load $binfile
|
|
runto_main
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
|
|
if { ![gdb_target_supports_trace] } then {
|
|
unsupported "current target does not support trace"
|
|
return 1
|
|
|
|
}
|
|
|
|
# If testing on a remote host, download the source file.
|
|
# remote_download host $srcdir/$subdir/$srcfile
|
|
|
|
|
|
#
|
|
# test passcount dynamically (live target)
|
|
#
|
|
|
|
set baseline [gdb_find_recursion_test_baseline $srcfile]
|
|
|
|
if { $baseline == -1 } then {
|
|
fail "could not find gdb_recursion_test function"
|
|
return
|
|
}
|
|
|
|
# define relative source line numbers:
|
|
# all subsequent line numbers are relative to this first one (baseline)
|
|
|
|
set testline2 [expr $baseline + 4]
|
|
set testline3 [expr $baseline + 5]
|
|
set testline4 [expr $baseline + 6]
|
|
|
|
#
|
|
# test passcount command semantics (live test)
|
|
#
|
|
|
|
## Set three tracepoints with three different passcounts.
|
|
## Verify that the experiment stops after the one with the
|
|
## lowest passcount is hit.
|
|
|
|
gdb_delete_tracepoints
|
|
set tdp2 [gdb_gettpnum "$testline2"]
|
|
set tdp3 [gdb_gettpnum "$testline3"]
|
|
set tdp4 [gdb_gettpnum "$testline4"]
|
|
if { $tdp2 <= 0 || $tdp3 <= 0 || $tdp4 <= 0 } then {
|
|
fail "setting tracepoints"
|
|
return
|
|
}
|
|
|
|
gdb_test "passcount 4 $tdp2" "Setting tracepoint $tdp2's passcount to 4" \
|
|
"4.5: set passcount for tracepoint $tdp2"
|
|
gdb_test "passcount 2 $tdp3" "Setting tracepoint $tdp3's passcount to 2" \
|
|
"4.5: set passcount for tracepoint $tdp3"
|
|
gdb_test "passcount 3 $tdp4" "Setting tracepoint $tdp4's passcount to 3" \
|
|
"4.5: set passcount for tracepoint $tdp4"
|
|
|
|
gdb_test "tstart" ".*" ""
|
|
|
|
gdb_breakpoint "end" qualified
|
|
gdb_test "continue" \
|
|
"Continuing.*Breakpoint $decimal, end.*" \
|
|
"run trace experiment"
|
|
gdb_test "tstop" ".*" ""
|
|
|
|
with_test_prefix "trace_frame -1" {
|
|
gdb_test "tfind none" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x -1 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
with_test_prefix "trace_frame 0" {
|
|
gdb_test "tfind tracepoint $tdp2" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 0 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
with_test_prefix "trace_frame 1" {
|
|
gdb_test "tfind tracepoint $tdp3" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 1 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
with_test_prefix "trace_frame 2" {
|
|
gdb_test "tfind tracepoint $tdp4" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 2 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
with_test_prefix "trace_frame 3" {
|
|
gdb_test "tfind tracepoint $tdp2" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 3 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
with_test_prefix "trace_frame 4" {
|
|
gdb_test "tfind tracepoint $tdp3" ".*"
|
|
gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" \
|
|
"print \$trace_frame"
|
|
}
|
|
|
|
## We should now be at the last frame, because this frame's passcount
|
|
## should have caused collection to stop. If we do a tfind now,
|
|
## it should fail.
|
|
|
|
gdb_test "tfind" "failed to find.*" "4.5: dynamic passcount test"
|
|
|
|
# Finished!
|
|
gdb_test "tfind none" ".*"
|
|
|