From 3cf139964eb2e2d3008174aa3d446797fce31240 Mon Sep 17 00:00:00 2001 From: Philippe Waroquiers Date: Wed, 26 Dec 2018 14:29:51 +0100 Subject: Fix gdb.ada/assign_arr.exp by using more unique names. 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 26e2dcd..3da07ba 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 d102dd3..60010cc 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 a58c987..deb9e74 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; -- cgit v1.1