From patchwork Tue Jan 30 09:22:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roirand X-Patchwork-Id: 25686 Received: (qmail 35947 invoked by alias); 30 Jan 2018 09:23:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 35933 invoked by uid 89); 30 Jan 2018 09:23:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: mail-wm0-f66.google.com Received: from mail-wm0-f66.google.com (HELO mail-wm0-f66.google.com) (74.125.82.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 30 Jan 2018 09:23:04 +0000 Received: by mail-wm0-f66.google.com with SMTP id r71so19674211wmd.1 for ; Tue, 30 Jan 2018 01:23:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wVQpXix23K2GDRcNup6oo2Ht5IYxExdHtpZf8vZqlZs=; b=rO59Ze19Ej0W4u5vhdTXhorSQL+QgOIXksuYiQ05eLQdxOWwypG7nb+owloPU4TqNZ Pm43GeJPu4lxBUScWDj4gXSKgE6DHyQvH4+lI8MGUNWRRk64oTuMiaxx/Hd8fd/N0tO4 RoTbZR6Z3iVD+meDs3ZZDrNDKar5vkTMDKjutoRHXyAj/6z+pMPwe3fNNRMQzOSQdvc5 PmfKGgCHoSw204pg7QYjfCr5Zyysu8lbm+lmku2YWI91zAG0X5u3xaESZFd+1qTkdqh9 axdvS/LaA1LrhA/6uOGUzGANRroCoMhfkK+HGB6TDwA2wY1X1szxTdGjrDm3oIRI1XCi dGrw== X-Gm-Message-State: AKwxyteaNziQ3L97hSWQ2aeU4Fo4fPmo9cDz8DCZfdyg79VaaCwvg/mf QZ4swHsKtsD9TVKGJaZYOZtzUTLB X-Google-Smtp-Source: AH8x227qoOEqeURko3RWAN3K3C8bT+q2XZm09nmZYEBGmSNmp/tgAnA+RtHyUAMJMxps7wqfDAJkog== X-Received: by 10.28.127.73 with SMTP id a70mr18098592wmd.43.1517304181899; Tue, 30 Jan 2018 01:23:01 -0800 (PST) Received: from adacore.com ([46.18.100.10]) by smtp.gmail.com with ESMTPSA id p10sm1052609wrh.96.2018.01.30.01.22.59 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 30 Jan 2018 01:23:01 -0800 (PST) Received: by adacore.com (sSMTP sendmail emulation); Tue, 30 Jan 2018 10:22:57 +0100 From: Xavier Roirand To: gdb-patches@sourceware.org Cc: Xavier Roirand , brobecker@adacore.com Subject: [PATCHv2 1/4] (Ada) Add testcase for catch assert with condition Date: Tue, 30 Jan 2018 10:22:48 +0100 Message-Id: <1517304168-15450-1-git-send-email-roirand@adacore.com> In-Reply-To: <20180123114306.b6w2csxzygomqlnd@adacore.com> References: <20180123114306.b6w2csxzygomqlnd@adacore.com> X-IsSubscribed: yes 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; +