Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
To: gdb-patches@sourceware.org
Cc: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Subject: [RFAv2 3/4] Fix gdb.ada/assign_arr.exp by using more unique names.
Date: Wed, 26 Dec 2018 14:03:00 -0000	[thread overview]
Message-ID: <20181226140304.19594-4-philippe.waroquiers@skynet.be> (raw)
In-Reply-To: <20181226140304.19594-1-philippe.waroquiers@skynet.be>

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  <philippe.waroquiers@skynet.be>

	* 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


  parent reply	other threads:[~2018-12-26 14:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-26 14:03 [RFAv2 0/4] Fix some gdb.ada tests failure " Philippe Waroquiers
2018-12-26 14:03 ` [RFAv2 2/4] Fix gdb.ada/rename_subscript_param.exp " Philippe Waroquiers
2018-12-26 15:27   ` Joel Brobecker
2018-12-26 15:50     ` Philippe Waroquiers
2018-12-27  2:36       ` Joel Brobecker
2018-12-26 14:03 ` [RFAv2 4/4] Fix gdb.ada/fun_renaming.exp " Philippe Waroquiers
2018-12-27  2:39   ` Joel Brobecker
2018-12-27 10:07     ` Philippe Waroquiers
2018-12-26 14:03 ` Philippe Waroquiers [this message]
2018-12-26 15:29   ` [RFAv2 3/4] Fix gdb.ada/assign_arr.exp " Joel Brobecker
2018-12-26 14:03 ` [RFAv2 1/4] Fix gdb.ada/packed_array_assign.exp " Philippe Waroquiers
2018-12-26 15:20   ` Joel Brobecker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181226140304.19594-4-philippe.waroquiers@skynet.be \
    --to=philippe.waroquiers@skynet.be \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox