From patchwork Mon Jan 29 12:46:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roirand X-Patchwork-Id: 25662 Received: (qmail 112852 invoked by alias); 29 Jan 2018 12:47:01 -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 112837 invoked by uid 89); 29 Jan 2018 12:47:01 -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-f41.google.com Received: from mail-wm0-f41.google.com (HELO mail-wm0-f41.google.com) (74.125.82.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 29 Jan 2018 12:46:59 +0000 Received: by mail-wm0-f41.google.com with SMTP id f71so13973885wmf.0 for ; Mon, 29 Jan 2018 04:46:58 -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=wKhq51qBSpn6f5I54cFZ6ZMJM+xsGYDLHEA+mNX9bEc=; b=VfEmilDbLf+lz4aZmP98ydcKNSvWDIDBFsu36izIUPWOPg+P0pFYt+ciSFRsMqICwd WVNXnSg4tky/FhRN1yjRDEBvCwtb2XEhSZPiTMwa5Qe2bcUY49Mx1zq2lO+efWlJnvZH O7FyJuRM9F4fVR9m3fDmHQ+U5zjCXvmcX7IxMEgX+fWH7xeMHNB3QlB5jSEynOOxF6yz 2JkTxoBFL2uTAPUcIrximk4vF7DTgZukY1CpWd0biYxgNjli3xo3da6Q+nL5q6E/ppGz gJzI5CkiXKsxfjnY/HLix8OHhdNDfLX23gn6zMxTIVexGmmogTWupAA0kZXo1KxOGyic VTBQ== X-Gm-Message-State: AKwxyteE6BTxuFxlzkjlBDasbOSIoPdLvgbnw5v0BESL+1uEho2sLrgU mbGvkgMCLwIBwZ0k/TGMtG82P/mT X-Google-Smtp-Source: AH8x2261s1NV/oO3EQ4CfGSyd5y9m85sgKJD8bNm4BCs/XZH1qq5TjRjX60HqbTgTXVfr+PpWZbA+A== X-Received: by 10.28.191.19 with SMTP id p19mr16611229wmf.142.1517230016577; Mon, 29 Jan 2018 04:46:56 -0800 (PST) Received: from adacore.com ([46.18.100.10]) by smtp.gmail.com with ESMTPSA id 31sm13621100wra.49.2018.01.29.04.46.54 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Jan 2018 04:46:56 -0800 (PST) Received: by adacore.com (sSMTP sendmail emulation); Mon, 29 Jan 2018 13:46:54 +0100 From: Xavier Roirand To: gdb-patches@sourceware.org Cc: Xavier Roirand , brobecker@adacore.com Subject: [PATCH 2/4] (Ada/MI) Add testcase for mi catch assert with condition Date: Mon, 29 Jan 2018 13:46:52 +0100 Message-Id: <1517230012-30010-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/mi_catch_assert.exp: New testcase. * gdb.ada/mi_catch_assert/bla.adb: New file. * gdb.ada/mi_catch_assert/pck.ads: New file. Tested on x86_64-linux. --- gdb/testsuite/gdb.ada/mi_catch_assert.exp | 99 +++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/mi_catch_assert/bla.adb | 46 +++++++++++++ gdb/testsuite/gdb.ada/mi_catch_assert/pck.ads | 19 +++++ 3 files changed, 164 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/mi_catch_assert.exp create mode 100644 gdb/testsuite/gdb.ada/mi_catch_assert/bla.adb create mode 100644 gdb/testsuite/gdb.ada/mi_catch_assert/pck.ads diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp new file mode 100644 index 0000000..ff8943c --- /dev/null +++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp @@ -0,0 +1,99 @@ +# Copyright 2011-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 +} + +# Some global variables used to simplify the maintenance of some of +# the regular expressions below. +set eol "\[\r\n\]+" +set sp "\[ \t\]*" + +# 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 $decimal: 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} + +################################################### +# 2. Try catching conditionnal 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 ![mi_run_to_main] then { + fail "cannot run to main, testcase aborted" + return 0 +} + +mi_gdb_test "-catch-assert -c \"Global_Var = 2\"" \ + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",addr=\"$hex\",what=\"failed Ada assertions\",.*}" \ + "catch assert failures with condition" + +set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb] +mi_execute_to "exec-continue" \ + "breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal" \ + "bla" "" ".*" "$bp_location" \ + ".*" \ + "continue to assert failure catchpoint hit" + +# Exit the inferior. +mi_send_resuming_command "exec-continue" "continuing to inferior exit" +mi_expect_stop "exited-normally" "" "" "" "" "" "exit normally" + +mi_gdb_exit +return 0 diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert/bla.adb b/gdb/testsuite/gdb.ada/mi_catch_assert/bla.adb new file mode 100644 index 0000000..6b3b2e7 --- /dev/null +++ b/gdb/testsuite/gdb.ada/mi_catch_assert/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/mi_catch_assert/pck.ads b/gdb/testsuite/gdb.ada/mi_catch_assert/pck.ads new file mode 100644 index 0000000..f00f5b3 --- /dev/null +++ b/gdb/testsuite/gdb.ada/mi_catch_assert/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; +