mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
4dfef5be68
As follow-up to this discussion: https://sourceware.org/pipermail/gdb-patches/2020-August/171385.html ... make runto_main not pass no-message to runto. This means that if we fail to run to main, for some reason, we'll emit a FAIL. This is the behavior we want the majority of (if not all) the time. Without this, we rely on tests logging a failure if runto_main fails, otherwise. They do so in a very inconsisteny mannet, sometimes using "fail", "unsupported" or "untested". The messages also vary widly. This patch removes all these messages as well. Also, remove a few "fail" where we call runto (and not runto_main). by default (without an explicit no-message argument), runto prints a failure already. In two places, gdb.multi/multi-re-run.exp and gdb.python/py-pp-registration.exp, remove "message" passed to runto. This removes a few PASSes that we don't care about (but FAILs will still be printed if we fail to run to where we want to). This aligns their behavior with the rest of the testsuite. Change-Id: Ib763c98c5f4fb6898886b635210d7c34bd4b9023
127 lines
3.5 KiB
Plaintext
127 lines
3.5 KiB
Plaintext
# Copyright 2000-2021 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@redhat.com)
|
|
|
|
set skip_float_test [gdb_skip_float_test]
|
|
|
|
# re-use the program from the "return2" test.
|
|
if { [prepare_for_testing "failed to prepare" finish return2.c] } {
|
|
return -1
|
|
}
|
|
|
|
proc finish_1 { type } {
|
|
global gdb_prompt
|
|
|
|
gdb_test "break ${type}_func" "Breakpoint \[0123456789\].*" \
|
|
"set break on ${type}_func"
|
|
gdb_test "continue" "Breakpoint.* ${type}_func.*" \
|
|
"continue to ${type}_func"
|
|
gdb_test_multiple "finish" "finish from ${type}_func" {
|
|
-re ".*Value returned is .* = 49 '1'\r\n$gdb_prompt $" {
|
|
if { $type == "char" } {
|
|
pass "finish from char_func"
|
|
} else {
|
|
fail "finish from ${type}_func"
|
|
}
|
|
}
|
|
-re ".*Value returned is .* = \[0123456789\]* '1'\r\n$gdb_prompt $" {
|
|
if { $type == "char" } {
|
|
pass "finish from char_func (non-ASCII char set?)"
|
|
} else {
|
|
fail "finish from ${type}_func"
|
|
}
|
|
}
|
|
-re ".*Value returned is .* = 1\r\n$gdb_prompt $" {
|
|
pass "finish from ${type}_func"
|
|
}
|
|
}
|
|
}
|
|
|
|
proc finish_void { } {
|
|
global gdb_prompt
|
|
|
|
gdb_test "break void_func" "Breakpoint \[0123456789\].*" \
|
|
"set break on void_func"
|
|
gdb_test "continue" "Breakpoint.* void_func.*" \
|
|
"continue to void_func"
|
|
# Some architectures will have one or more instructions after the
|
|
# call instruction which still is part of the call sequence, so we
|
|
# must be prepared for a "finish" to show us the void_func call
|
|
# again as well as the statement after.
|
|
gdb_test_multiple "finish" "finish from void_func" {
|
|
-re ".*void_checkpoint.*$gdb_prompt $" {
|
|
pass "finish from void_func"
|
|
}
|
|
-re "0x\[0-9a-fA-F\]+ in main.*call to void_func.*$gdb_prompt $" {
|
|
pass "finish from void_func"
|
|
}
|
|
}
|
|
}
|
|
|
|
# A function that tests that the given ABBREV is a working abbreviation
|
|
# of the "finish" command.
|
|
|
|
proc finish_abbreviation { abbrev } {
|
|
|
|
if { ! [ runto "int_func" ] } then {
|
|
return -1
|
|
}
|
|
|
|
gdb_test "$abbrev" \
|
|
"Value returned is .* = 1" \
|
|
"Testing the \"$abbrev\" abbreviation for \"finish\""
|
|
}
|
|
|
|
# Test "set print finish off".
|
|
proc finish_no_print {} {
|
|
global decimal
|
|
|
|
if {![runto "int_func"]} {
|
|
return
|
|
}
|
|
gdb_test_no_output "set print finish off"
|
|
gdb_test "finish" \
|
|
"Value returned is \\\$$decimal = <not displayed>"
|
|
gdb_test "print \$" " = 1" \
|
|
"Ensure return value was properly saved"
|
|
}
|
|
|
|
proc finish_tests { } {
|
|
global gdb_prompt skip_float_test
|
|
|
|
if { ! [ runto_main ] } then {
|
|
return -1
|
|
}
|
|
|
|
finish_void
|
|
finish_1 "char"
|
|
finish_1 "short"
|
|
finish_1 "int"
|
|
finish_1 "long"
|
|
finish_1 "long_long"
|
|
if {!$skip_float_test} {
|
|
finish_1 "float"
|
|
finish_1 "double"
|
|
}
|
|
finish_abbreviation "fin"
|
|
finish_no_print
|
|
}
|
|
|
|
set prev_timeout $timeout
|
|
set timeout 30
|
|
finish_tests
|
|
set timeout $prev_timeout
|