From 395507f62b98a6a1f6778295a5667110b0fc4b57 Mon Sep 17 00:00:00 2001 From: Xavier Roirand Date: Mon, 29 Jan 2018 10:43:21 +0100 Subject: [PATCH] (Ada) Add testcase for catch assert with condition gdb/testsuite/ChangeLog: * gdb.ada/catch_assert_if.exp: New testcase. * gdb.ada/catch_assert_if/bla.adb: New file. * gdb.ada/catch_assert_if/pck.ads: New file. Tested on x86_64-linux. --- gdb/testsuite/gdb.ada/catch_assert_if.exp | 86 +++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/catch_assert_if/bla.adb | 46 ++++++++++++++ gdb/testsuite/gdb.ada/catch_assert_if/pck.ads | 19 ++++++ 3 files changed, 151 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/catch_assert_if.exp create mode 100644 gdb/testsuite/gdb.ada/catch_assert_if/bla.adb create mode 100644 gdb/testsuite/gdb.ada/catch_assert_if/pck.ads diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp new file mode 100644 index 0000000..a6d5dc3 --- /dev/null +++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp @@ -0,0 +1,86 @@ +# Copyright 2018 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 . + +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}breakpoint${sp}keep${sp}y${sp}$hex 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" diff --git a/gdb/testsuite/gdb.ada/catch_assert_if/bla.adb b/gdb/testsuite/gdb.ada/catch_assert_if/bla.adb new file mode 100644 index 0000000..6b3b2e7 --- /dev/null +++ b/gdb/testsuite/gdb.ada/catch_assert_if/bla.adb @@ -0,0 +1,46 @@ +-- Copyright 2018 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 . + +with Pck; use Pck; + +procedure Bla is +begin + Global_Var := 1; + declare + begin + pragma Assert (Global_Var /= 1, "Error #1"); + exception + when others => + null; + end; + + Global_Var := 2; + declare + begin + pragma Assert (Global_Var = 1, "Error #2"); -- STOP + exception + when others => + null; + end; + + Global_Var := 3; + declare + begin + pragma Assert (Global_Var = 2, "Error #3"); + exception + when others => + null; + end; +end Bla; diff --git a/gdb/testsuite/gdb.ada/catch_assert_if/pck.ads b/gdb/testsuite/gdb.ada/catch_assert_if/pck.ads new file mode 100644 index 0000000..f00f5b3 --- /dev/null +++ b/gdb/testsuite/gdb.ada/catch_assert_if/pck.ads @@ -0,0 +1,19 @@ +-- Copyright 2018 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 . + +package Pck is + Global_Var : Integer := 0; +end Pck; + -- 2.7.4