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
183 lines
5 KiB
Text
183 lines
5 KiB
Text
# Copyright 2011-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/>.
|
|
|
|
standard_testfile .c
|
|
|
|
# Fission doesn't support macros yet. Bug 15954.
|
|
if [using_fission] {
|
|
untested "fission does not support macros yet"
|
|
return -1
|
|
}
|
|
|
|
if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug macros}] } {
|
|
return -1
|
|
}
|
|
|
|
if ![runto_main] {
|
|
return -1
|
|
}
|
|
|
|
# Test various error messages.
|
|
gdb_test "info macro -- -all" \
|
|
"The symbol `-all' has no definition .*\r\nat .*$srcfile:\[0-9\]+"
|
|
gdb_test "info macro -- -all" \
|
|
"The symbol `-all' has no definition .*\r\nat .*$srcfile:\[0-9\]+"
|
|
|
|
gdb_test "info macro -all --" \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]"
|
|
|
|
gdb_test "info macro -all --" \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]"
|
|
|
|
gdb_test "info macro -all --" \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]"
|
|
|
|
gdb_test "info macro --" \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]"
|
|
|
|
gdb_test "info macro -- " \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
|
|
"info macro -- <EOL>"
|
|
gdb_test "info macro -- " \
|
|
"You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
|
|
"info macro -- <EOL>"
|
|
|
|
gdb_test "info macro -invalid-option" \
|
|
"Unrecognized option.*Try \"help info macro\"\."
|
|
|
|
gdb_test "info macro -invalid-option" \
|
|
"Unrecognized option.*Try \"help info macro\"\."
|
|
|
|
gdb_test "info macro -invalid-option FOO" \
|
|
"Unrecognized option.*Try \"help info macro\"\."
|
|
gdb_test "info macro -invalid-option FOO" \
|
|
"Unrecognized option.*Try \"help info macro\"\."
|
|
|
|
# Single macro lookups.
|
|
gdb_test "info macro -- FOO" \
|
|
".*#define FOO \"hello\""
|
|
|
|
gdb_test "info macro -- FOO" \
|
|
".*#define FOO \"hello\""
|
|
|
|
gdb_test "info macro -- FOO" \
|
|
".*#define FOO \"hello\""
|
|
|
|
gdb_test "info macro FOO" \
|
|
".*#define FOO \"hello\""
|
|
|
|
gdb_test "info macro FOO" \
|
|
".*#define FOO \"hello\""
|
|
|
|
# Multiple macro lookups.
|
|
set test "info macro -a FOO"
|
|
set r1 ".*#define FOO \"hello\""
|
|
set r2 ".*#define FOO \" \""
|
|
set r3 ".*#define FOO \"world\""
|
|
set r4 ".*#define FOO\\(a\\) foo = a"
|
|
set testname "$test 1"
|
|
gdb_test "$test" "$r1$r2$r3$r4" "$testname"
|
|
|
|
set test "info macro -a -- FOO"
|
|
set testname "$test 1"
|
|
gdb_test "$test" "$r1$r2$r3$r4" "$testname"
|
|
|
|
set test "info macro -all -- FOO"
|
|
set testname "$test 1"
|
|
gdb_test "$test" "$r1$r2$r3$r4" "$testname"
|
|
|
|
set test "info macro -a -- FOO"
|
|
gdb_test "$test" "$r1$r2$r3$r4"
|
|
|
|
set test "info macro -a -- FOO"
|
|
gdb_test "$test" "$r1$r2$r3$r4"
|
|
|
|
set test "info macros"
|
|
set r1 "#define FOO \"hello\""
|
|
set r2 "#define ONE"
|
|
set testname "$test 2"
|
|
gdb_test_lines $test $testname $r1.*$r2 \
|
|
-re-not "#define TWO" \
|
|
-re-not "#define THREE" \
|
|
-re-not "#define FOUR"
|
|
|
|
gdb_test "next" "" "next, 1"
|
|
|
|
set r1 "#define FOO \" \""
|
|
set r2 "#define ONE"
|
|
set r3 "#define TWO"
|
|
set testname "$test 3"
|
|
gdb_test_lines $test $testname $r1.*$r2.*$r3 \
|
|
-re-not "#define THREE" \
|
|
-re-not "#define FOUR"
|
|
|
|
gdb_test "next" "" "next, 2"
|
|
|
|
# in alphabetical order...
|
|
set r1 "#define FOO \"world\""
|
|
set r2 "#define ONE"
|
|
set r3 "#define THREE"
|
|
set r4 "#define TWO"
|
|
set testname "$test 4"
|
|
gdb_test_lines $test $testname $r1.*$r2.*$r3.*$r4 \
|
|
-re-not "#define FOUR"
|
|
|
|
# same as above with a linespec.
|
|
set test "info macros *\$pc"
|
|
gdb_test_lines $test "" $r1.*$r2.*$r3.*$r4 \
|
|
-re-not "#define FOUR"
|
|
gdb_test "next" "" "next, 3"
|
|
|
|
set r1 "#define FOO \" \""
|
|
set r2 "#define ONE"
|
|
set r3 "#define TWO."
|
|
set test "info macros"
|
|
set testname "$test 5"
|
|
gdb_test_lines $test $testname $r1.*$r2.*$r3 \
|
|
-re-not "#define THREE" \
|
|
-re-not "#define FOUR"
|
|
gdb_test "next" "" "next, 4"
|
|
gdb_test "next" "" "next, 5"
|
|
|
|
set r1 "#define DEF_MACROS"
|
|
set testname "$test 6"
|
|
gdb_test_lines $test $testname $r1 \
|
|
-re-not "#define FOO" \
|
|
-re-not "#define ONE" \
|
|
-re-not "#define TWO" \
|
|
-re-not "#define THREE" \
|
|
-re-not "#define FOUR"
|
|
|
|
gdb_test "next" "" "next, 6"
|
|
set r1 "#define DEF_MACROS"
|
|
set r2 "#define FOO\\(a\\) foo = a"
|
|
set r3 "#define FOUR"
|
|
set testname "$test 7"
|
|
gdb_test_lines $test $testname $r1.*$r2.*$r3 \
|
|
-re-not "#define FOO \" \"" \
|
|
-re-not "#define FOO \"hello\"" \
|
|
-re-not "#define FOO \"world\"" \
|
|
-re-not "#define ONE" \
|
|
-re-not "#define TWO" \
|
|
-re-not "#define THREE"
|
|
|
|
set test "info macros info-macros.c:42"
|
|
|
|
set r1 "#define DEF_MACROS "
|
|
set r2 "#define ONE"
|
|
gdb_test_lines "$test" "" [multi_line \
|
|
"" \
|
|
"$r1" \
|
|
"(.*\r\n)?$r2"]
|