From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 37592 invoked by alias); 7 Oct 2019 12:18:44 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 37543 invoked by uid 9876); 7 Oct 2019 12:18:44 -0000 Date: Mon, 07 Oct 2019 12:18:00 -0000 Message-ID: <20191007121844.37542.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite/ada: Handle missing debug info case X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: b2caee6aaa78106d7ae3c46dda3a84a325e43a1d X-Git-Newrev: 60ff3cd784ac3a96084af21e4c945fe6925cd1fa X-SW-Source: 2019-10/txt/msg00080.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=60ff3cd784ac3a96084af21e4c945fe6925cd1fa commit 60ff3cd784ac3a96084af21e4c945fe6925cd1fa Author: Andrew Burgess Date: Mon Oct 7 13:10:55 2019 +0100 gdb/testsuite/ada: Handle missing debug info case Update a test script to handle the case where missing Ada debug information means we can't catch exceptions. This was discussed on the list here: https://sourceware.org/ml/gdb-patches/2019-08/msg00607.html And is similar to code that already exists in the test scripts gdb.ada/catch_ex.exp and gdb.ada/mi_catch_ex.exp. gdb/testsuite/ChangeLog: * gdb.ada/catch_ex_std.exp: Handle being unabled to catch Ada exceptions due to missing debug information. Diff: --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.ada/catch_ex_std.exp | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c3fc339..4adf16a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-07 Andrew Burgess + + * gdb.ada/catch_ex_std.exp: Handle being unabled to catch Ada + exceptions due to missing debug information. + 2019-10-07 Tom de Vries * gdb.base/default.exp: Expect _gdb_major/_gdb_minor to be 9.1. diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp index 839d0bb..f3a4e59 100644 --- a/gdb/testsuite/gdb.ada/catch_ex_std.exp +++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp @@ -95,12 +95,23 @@ if {![runto_main]} then { return 0 } -gdb_test "catch exception some_kind_of_error" \ - "Catchpoint \[0-9\]+: `some_kind_of_error' Ada exception" +set can_catch_exceptions 0 +gdb_test_multiple "catch exception some_kind_of_error" "" { + -re "Catchpoint \[0-9\]+: `some_kind_of_error' Ada exception\r\n$gdb_prompt $" { + pass $gdb_test_name + set can_catch_exceptions 1 + } -gdb_test "cont" \ - "Catchpoint \[0-9\]+, .* at .*foo\.adb:\[0-9\]+.*" \ - "caught the exception" + -re "Your Ada runtime appears to be missing some debugging information.\r\nCannot insert Ada exception catchpoint in this configuration.\r\n$gdb_prompt $" { + unsupported $gdb_test_name + } +} -gdb_test "print \$_ada_exception = some_package.some_kind_of_error'Address" \ - " = true" +if { $can_catch_exceptions } { + gdb_test "cont" \ + "Catchpoint \[0-9\]+, .* at .*foo\.adb:\[0-9\]+.*" \ + "caught the exception" + + gdb_test "print \$_ada_exception = some_package.some_kind_of_error'Address" \ + " = true" +}