mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 18:44:20 +08:00
f06f1252b0
Like Pedro's earlier patches to change catchpoint to be of type bp_catchpoint, this changes the Ada catchpoints to follow. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-07-10 Tom Tromey <tromey@adacore.com> * ada-lang.h (is_ada_exception_catchpoint): Declare. * breakpoint.c (init_ada_exception_breakpoint): Register as bp_catchpoint. (print_one_breakpoint_location, print_one_breakpoint): Use is_ada_exception_catchpoint. * ada-lang.c (class ada_catchpoint_location): Pass bp_loc_software_breakpoint to bp_location constructor. (is_ada_exception_catchpoint): New function. gdb/testsuite/ChangeLog 2019-07-10 Tom Tromey <tromey@adacore.com> * gdb.ada/mi_ex_cond.exp: Update expected results. * gdb.ada/mi_catch_ex_hand.exp: Update expected results. * gdb.ada/mi_catch_ex.exp: Update expected results. * gdb.ada/mi_catch_assert.exp: Update expected results. * gdb.ada/catch_ex.exp (catch_exception_info) (catch_exception_entry, catch_assert_entry) (catch_unhandled_entry): Update. * gdb.ada/catch_assert_if.exp: Update expected results.
95 lines
3.1 KiB
Plaintext
95 lines
3.1 KiB
Plaintext
# Copyright 2013-2019 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"
|
|
|
|
standard_ada_testfile foo
|
|
|
|
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-static additional_flags=-margs ]] != "" } {
|
|
return -1
|
|
}
|
|
|
|
# # Some global variables used to simplify the maintenance of some of
|
|
# # the regular expressions below.
|
|
set any_nb "\[0-9\]+"
|
|
set eol "\[\r\n\]+"
|
|
|
|
# Before going any further, verify that we can insert exception
|
|
# catchpoints... That way, we won't have to do this while doing
|
|
# the actual GDB/MI testing.
|
|
|
|
clean_restart ${testfile}
|
|
|
|
if ![runto_main] then {
|
|
fail "cannot run to main, testcase aborted"
|
|
return 0
|
|
}
|
|
|
|
set msg "insert catchpoint on all Ada exceptions"
|
|
gdb_test_multiple "catch exception" $msg {
|
|
-re "Catchpoint $any_nb: all Ada exceptions$eol$gdb_prompt $" {
|
|
pass $msg
|
|
}
|
|
-re "Your Ada runtime appears to be missing some debugging information.*\[\r\n\]+$gdb_prompt $" {
|
|
# If the runtime was not built with enough debug information,
|
|
# or if it was stripped, we can not test exception
|
|
# catchpoints.
|
|
unsupported $msg
|
|
return -1
|
|
}
|
|
}
|
|
|
|
# Now, we can start the GDB/MI testing itself...
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
mi_delete_breakpoints
|
|
mi_gdb_reinitialize_dir $srcdir/$subdir
|
|
mi_gdb_load ${binfile}
|
|
|
|
# And finally, the meat of the testcase... Insert an Ada exception
|
|
# catchpoint that uses both conditions and exception name.
|
|
|
|
mi_gdb_test "-catch-exception -c \"i = 2\" -e constraint_error" \
|
|
"\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*}" \
|
|
"catch C_E if i = 2"
|
|
|
|
# It is important that we start the program's execution after having
|
|
# inserted the exception catchpoint above. We want to verify that
|
|
# we are able to re-evaluate the exception catchpoint exception
|
|
# address and stop condition without problems when new shared libraries
|
|
# get mapped (during program startup).
|
|
|
|
mi_run_cmd
|
|
|
|
mi_expect_stop \
|
|
"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR(\",exception-message=\"foo\\.adb:$decimal explicit raise)?" \
|
|
"foo" "" ".*" ".*" \
|
|
".*" \
|
|
"run to exception catchpoint hit"
|
|
|
|
# Make sure that any of the catchpoint re-evaluations didn't cause
|
|
# a clobbering of some of the exeption's info.
|
|
|
|
mi_gdb_test "-break-list" \
|
|
"\\^done,.*,what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*" \
|
|
"-break-list"
|