From patchwork Sun Dec 23 20:23:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 30824 Received: (qmail 86051 invoked by alias); 23 Dec 2018 20:23:20 -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 86040 invoked by uid 89); 23 Dec 2018 20:23:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=chances, UD:be, cancel, seconds X-HELO: mailsec118.isp.belgacom.be Received: from mailsec118.isp.belgacom.be (HELO mailsec118.isp.belgacom.be) (195.238.20.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Dec 2018 20:23:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1545596597; x=1577132597; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=J0jzEKj4um/yYVj/i56YQ+4pnLsDTX0HLYAM8v3c1wo=; b=aOgLJ3BqtsNNSWgRQ37NfFHK0jsZ3jbsyM010Muts6LzJPOZjfE41NqM x7KDMwzkBgDTRFE8YbH0nSpBHDXzJA==; Received: from 184.205-67-87.adsl-dyn.isp.belgacom.be (HELO md.home) ([87.67.205.184]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 23 Dec 2018 21:23:14 +0100 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFA] Fix gdb.ada bp_fun_addr failure due to conflict between fun 'a' and s-dimmks.ads 'A'. Date: Sun, 23 Dec 2018 21:23:08 +0100 Message-Id: <20181223202308.31611-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes The test fails (timeout) due to: (gdb) PASS: gdb.ada/bp_fun_addr.exp: break *a'address run Starting program: /bd/home/philippe/gdb/git/build_info_t/gdb/testsuite/outputs/gdb.ada/bp_fun_addr/a Multiple matches for a [0] cancel [1] a at /bd/home/philippe/gdb/git/info_t/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb:18 [2] system.dim.mks.a at s-dimmks.ads:115 > FAIL: gdb.ada/bp_fun_addr.exp: run until breakpoint at a'address (timeout) testcase /home/philippe/gdb/git/build_info_t/gdb/testsuite/../../../info_t/gdb/testsuite/gdb.ada/bp_fun_addr.exp completed in 10 seconds Fix this by using a fun name that has more chances to be unique. 2018-12-23 Philippe Waroquiers * gdb.ada/bp_fun_addr/a.adb (a): Rename to bp_fun_addr. Filename a.adb changed to bp_fun_addr.adb. gdb.ada/bp_fun_addr.exp: Update test accordingly. --- gdb/testsuite/gdb.ada/bp_fun_addr.exp | 10 +++++----- .../gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename gdb/testsuite/gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} (94%) diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr.exp b/gdb/testsuite/gdb.ada/bp_fun_addr.exp index b037d43538..38a2609677 100644 --- a/gdb/testsuite/gdb.ada/bp_fun_addr.exp +++ b/gdb/testsuite/gdb.ada/bp_fun_addr.exp @@ -17,7 +17,7 @@ load_lib "ada.exp" if { [skip_ada_tests] } { return -1 } -standard_ada_testfile a +standard_ada_testfile bp_fun_addr if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { return -1 @@ -25,11 +25,11 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { clean_restart ${testfile} -gdb_test "break *a'address" \ - "Breakpoint \[0-9\]+ at.*: file .*a.adb, line \[0-9\]+." +gdb_test "break *bp_fun_addr'address" \ + "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+." gdb_run_cmd gdb_test "" \ - "Breakpoint $decimal, a \\(\\).*" \ - "run until breakpoint at a'address" + "Breakpoint $decimal, bp_fun_addr \\(\\).*" \ + "run until breakpoint at bp_fun_addr'address" diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb similarity index 94% rename from gdb/testsuite/gdb.ada/bp_fun_addr/a.adb rename to gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb index 00e2e86355..2faf6da843 100644 --- a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb +++ b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb @@ -13,7 +13,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -procedure A is +procedure Bp_Fun_Addr is begin null; -end A; +end Bp_Fun_Addr;