From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39641 invoked by alias); 26 Dec 2018 14:03:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 39549 invoked by uid 89); 26 Dec 2018 14:03:22 -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 autolearn=ham version=3.3.2 spammy=cancel, STOP, 2018-12-26, H*Ad:D*be 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:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1545833000; x=1577369000; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tyOi0hH6kFgibDtyX9s8v/m2DMoRLepBauSfOD0Q5iw=; b=mCmcAhPByJcf4HKk08CcgUttj3aKw51RGDuwDJbyCr+kkAliunkvFOo9 BHT2yUY0hlbhqnhAnXKyTlEbLwbtiQ==; 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 3/4] Fix gdb.ada/assign_arr.exp by using more unique names. Date: Wed, 26 Dec 2018 14:03:00 -0000 Message-Id: <20181226140304.19594-4-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 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2018-12/txt/msg00325.txt.bz2 The test fails (timeout) due to conflict between var 'input' and s-ststop.adb 'input': (gdb) print input.u2 := (0.25,0.5,0.75) Multiple matches for input [0] cancel [1] system.strings.stream_ops.storage_array_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return system.storage_elements.storage_array at s-ststop.adb:127 [2] system.strings.stream_ops.stream_element_array_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return ada.streams.stream_element_array at s-ststop.adb:127 [3] system.strings.stream_ops.string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return string at s-ststop.adb:127 [4] system.strings.stream_ops.wide_string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return wide_string at s-ststop.adb:127 [5] system.strings.stream_ops.wide_wide_string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return wide_wide_string at s-ststop.adb:127 [6] target_wrapper.input at /bd/home/philippe/gdb/git/info_t/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads:24 > FAIL: gdb.ada/assign_arr.exp: print input.u2 := (0.25,0.5,0.75) (timeout) gdb/testsuite/ChangeLog 2018-12-26 Philippe Waroquiers * gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to Assign_Arr_Input. main_p324_051.adb: Update accordingly. gdb.ada/assign_arr.exp: Likewise. --- gdb/testsuite/gdb.ada/assign_arr.exp | 2 +- gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb | 2 +- gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.ada/assign_arr.exp b/gdb/testsuite/gdb.ada/assign_arr.exp index 26e2dcda8e..3da07ba99c 100644 --- a/gdb/testsuite/gdb.ada/assign_arr.exp +++ b/gdb/testsuite/gdb.ada/assign_arr.exp @@ -26,5 +26,5 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/main_p324_051.adb] runto "main_p324_051.adb:$bp_location" -gdb_test "print input.u2 := (0.25,0.5,0.75)" \ +gdb_test "print assign_arr_input.u2 := (0.25,0.5,0.75)" \ " = \\(0\\.25, 0\\.5, 0\\.75\\)" diff --git a/gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb b/gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb index d102dd3e67..60010ccc09 100644 --- a/gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb +++ b/gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb @@ -17,5 +17,5 @@ with target_wrapper; use target_wrapper; procedure Main_P324_051 is begin - input.u2 := (0.2,0.3,0.4); -- STOP + Assign_Arr_Input.u2 := (0.2,0.3,0.4); -- STOP end Main_P324_051; diff --git a/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads b/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads index a58c98790f..deb9e747b2 100644 --- a/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads +++ b/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads @@ -21,6 +21,6 @@ package target_wrapper is u2 : Float_Array_3; end record; - input : parameters; + Assign_Arr_Input : parameters; end target_wrapper; -- 2.19.2