From patchwork Wed Dec 26 14:03:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 30845 Received: (qmail 41175 invoked by alias); 26 Dec 2018 14:03:34 -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 41021 invoked by uid 89); 26 Dec 2018 14:03:33 -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, RCVD_IN_DNSWL_LOW, SPF_PASS, TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: mailsec117.isp.belgacom.be Received: from mailsec117.isp.belgacom.be (HELO mailsec117.isp.belgacom.be) (195.238.20.113) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Dec 2018 14:03:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1545833003; x=1577369003; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lHasqglSJv83qzEYuDNpM6KZhJalJa/WghhEOzqWgZc=; b=kLE9GTHcbASL19PpvLkT/QyA3hHUzKBiYs++U85hIZOsOtA4WyxY58H0 aQ3Bw0IMHGccnNYuggmSP5ssSVTZFw==; 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; 26 Dec 2018 15:03:10 +0100 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFAv2 4/4] Fix gdb.ada/fun_renaming.exp by using more unique names. Date: Wed, 26 Dec 2018 15:03:04 +0100 Message-Id: <20181226140304.19594-5-philippe.waroquiers@skynet.be> In-Reply-To: <20181226140304.19594-1-philippe.waroquiers@skynet.be> References: <20181226140304.19594-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes The test fails due to conflict between var 'next' and s-pooloc.adb next: (gdb) print next(1) Multiple matches for next [0] cancel [1] pack.next (integer) return integer at /bd/home/philippe/gdb/git/binutils-gdb/gdb/testsuite/gdb.ada/fun_renaming/pack.adb:19 [2] system.pool_local.next (system.address) return system.pool_local.acc_address at s-pooloc.adb:151 > FAIL: gdb.ada/fun_renaming.exp: print next(1) (timeout) Fix by making the names and renamings more unique. gdb/testsuite/ChangeLog 2018-12-26 Philippe Waroquiers * gdb.ada/fun_renaming/pack.ads (Next): Rename to Fun_Rename_Test_Next. (Renamed_Next): Rename to Renamed_Fun_Rename_Test_Next. gdb.ada/fun_renaming/pack.adb (Next): Rename to Fun_Rename_Test_Next. gdb.ada/fun_renaming/fun_renaming.adb (N): Rename to Fun_Rename_Test_N. gdb.ada/fun_renaming.exp: Update accordingly. --- gdb/testsuite/gdb.ada/fun_renaming.exp | 14 +++++++------- .../gdb.ada/fun_renaming/fun_renaming.adb | 7 ++++--- gdb/testsuite/gdb.ada/fun_renaming/pack.adb | 4 ++-- gdb/testsuite/gdb.ada/fun_renaming/pack.ads | 5 +++-- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/gdb.ada/fun_renaming.exp b/gdb/testsuite/gdb.ada/fun_renaming.exp index 4d4116cc13..cbdd0032ea 100644 --- a/gdb/testsuite/gdb.ada/fun_renaming.exp +++ b/gdb/testsuite/gdb.ada/fun_renaming.exp @@ -27,18 +27,18 @@ set bp_location [gdb_get_line_number "BREAK" ${testdir}/fun_renaming.adb] runto "fun_renaming.adb:$bp_location" # Sanity check: make sure we can call a regular global function. -gdb_test "print next(1)" " = 2" +gdb_test "print fun_rename_test_next(1)" " = 2" # Starting with GCC 6, renamed subprograms are materialized in the debugging # information: make sure we can call the regular global function using its # multiple names. -set test "print n(1)" +set test "print fun_rename_test_n(1)" gdb_test_multiple $test $test { -re " = 2\..*$gdb_prompt $" { pass $test } - -re "No definition of \"n\" in current context\..*$gdb_prompt $" { + -re "No definition of \"fun_rename_test_n\" in current context\..*$gdb_prompt $" { if {[test_compiler_info {gcc-6*}]} { fail $test } else { @@ -47,12 +47,12 @@ gdb_test_multiple $test $test { } } -set test "print renamed_next(1)" +set test "print renamed_fun_rename_test_next(1)" gdb_test_multiple $test $test { -re " = 2\..*$gdb_prompt $" { pass $test } - -re "No definition of \"renamed_next\" in current context\..*$gdb_prompt $" { + -re "No definition of \"renamed_fun_rename_test_next\" in current context\..*$gdb_prompt $" { if {[test_compiler_info {gcc-6*}]} { fail $test } else { @@ -61,12 +61,12 @@ gdb_test_multiple $test $test { } } -set test "print pack.renamed_next(1)" +set test "print pack.renamed_fun_rename_test_next(1)" gdb_test_multiple $test $test { -re " = 2\..*$gdb_prompt $" { pass $test } - -re "No definition of \"pack\.renamed_next\" in current context\..*$gdb_prompt $" { + -re "No definition of \"pack\.renamed_fun_rename_test_next\" in current context\..*$gdb_prompt $" { if {[test_compiler_info {gcc-6*}]} { fail $test } else { diff --git a/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb b/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb index eae6eeaf73..12cec24a56 100644 --- a/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb +++ b/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb @@ -16,8 +16,9 @@ with Pack; procedure Fun_Renaming is - function N (I : Integer) return Integer renames Pack.Next; + function Fun_Rename_Test_N (I : Integer) return Integer + renames Pack.Fun_Rename_Test_Next; begin - Pack.Discard (N (1)); -- BREAK - Pack.Discard (Pack.Renamed_Next (1)); -- BREAK + Pack.Discard (Fun_Rename_Test_N (1)); -- BREAK + Pack.Discard (Pack.Renamed_Fun_Rename_Test_Next (1)); -- BREAK end Fun_Renaming; diff --git a/gdb/testsuite/gdb.ada/fun_renaming/pack.adb b/gdb/testsuite/gdb.ada/fun_renaming/pack.adb index abbec2a284..5349cdee5a 100644 --- a/gdb/testsuite/gdb.ada/fun_renaming/pack.adb +++ b/gdb/testsuite/gdb.ada/fun_renaming/pack.adb @@ -14,10 +14,10 @@ -- along with this program. If not, see . package body Pack is - function Next (I : Integer) return Integer is + function Fun_Rename_Test_Next (I : Integer) return Integer is begin return I + 1; - end Next; + end Fun_Rename_Test_Next; procedure Discard (I : Integer) is begin diff --git a/gdb/testsuite/gdb.ada/fun_renaming/pack.ads b/gdb/testsuite/gdb.ada/fun_renaming/pack.ads index be46315440..ba3a999f42 100644 --- a/gdb/testsuite/gdb.ada/fun_renaming/pack.ads +++ b/gdb/testsuite/gdb.ada/fun_renaming/pack.ads @@ -15,8 +15,9 @@ package Pack is - function Next (I : Integer) return Integer; - function Renamed_Next (I : Integer) return Integer renames Next; + function Fun_Rename_Test_Next (I : Integer) return Integer; + function Renamed_Fun_Rename_Test_Next (I : Integer) return Integer + renames Fun_Rename_Test_Next; procedure Discard (I : Integer); end Pack;