forked from Imagelibrary/binutils-gdb
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.
87 lines
2.9 KiB
Plaintext
87 lines
2.9 KiB
Plaintext
# Copyright 2018-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 bla
|
|
|
|
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
|
|
return -1
|
|
}
|
|
|
|
clean_restart ${testfile}
|
|
|
|
######################################################################
|
|
# 1. Try catching all exceptions to check that runtime supports it. #
|
|
######################################################################
|
|
|
|
set eol "\[\r\n\]+"
|
|
set sp "\[ \t\]*"
|
|
|
|
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 $decimal: all Ada exceptions$eol$gdb_prompt $" {
|
|
pass $msg
|
|
}
|
|
-re "Your Ada runtime appears to be missing some debugging information.*$eol$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
|
|
}
|
|
}
|
|
|
|
##################################################
|
|
# 2. Try catching conditional failed assertion. #
|
|
##################################################
|
|
|
|
# Here is the scenario:
|
|
# - Restart the debugger from scratch, runto_main
|
|
# We'll catch assertions if Global_Var = 2
|
|
# - continue, we should see the second failed assertion
|
|
# - continue, the program exits.
|
|
|
|
if ![runto_main] then {
|
|
fail "cannot run to main, testcase aborted"
|
|
return 0
|
|
}
|
|
|
|
gdb_test "catch assert if Global_Var = 2" \
|
|
"Catchpoint $decimal: failed Ada assertions" \
|
|
"insert catchpoint on failed assertions with condition"
|
|
|
|
# Check that condition is stored and properly displayed.
|
|
|
|
set exp_bp ".*$decimal${sp}catchpoint${sp}keep${sp}y${sp}failed Ada assertions$eol${sp}stop only if Global_Var = 2.*"
|
|
gdb_test "info breakpoint" $exp_bp "Check catch assertions with condition"
|
|
|
|
set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb]
|
|
|
|
set catchpoint_msg \
|
|
"Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location"
|
|
gdb_test "continue" \
|
|
"Continuing\.$eol$catchpoint_msg$eol.*STOP" \
|
|
"continuing to expected failed assertion"
|
|
|
|
gdb_test "continue" \
|
|
"Continuing\..*$inferior_exited_re.*" \
|
|
"continuing to program completion"
|