diff options
| author | Philippe Waroquiers <philippe.waroquiers@skynet.be> | 2018-12-26 14:33:10 +0100 |
|---|---|---|
| committer | Philippe Waroquiers <philippe.waroquiers@skynet.be> | 2018-12-27 10:47:00 +0100 |
| commit | 293bf1a719e88e063e75ae467c5aec101b59fbf6 (patch) | |
| tree | 56c553c57a1094ccbcec447b42b804b2b35aaf0c /gdb/testsuite/gdb.ada/fun_renaming | |
| parent | 3cf139964eb2e2d3008174aa3d446797fce31240 (diff) | |
| download | binutils-293bf1a719e88e063e75ae467c5aec101b59fbf6.zip binutils-293bf1a719e88e063e75ae467c5aec101b59fbf6.tar.gz binutils-293bf1a719e88e063e75ae467c5aec101b59fbf6.tar.bz2 | |
Fix gdb.ada/fun_renaming.exp by using more unique names.
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 <philippe.waroquiers@skynet.be>
* 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.
Diffstat (limited to 'gdb/testsuite/gdb.ada/fun_renaming')
| -rw-r--r-- | gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/fun_renaming/pack.adb | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/fun_renaming/pack.ads | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb b/gdb/testsuite/gdb.ada/fun_renaming/fun_renaming.adb index eae6eea..12cec24 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 abbec2a..5349cde 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 <http://www.gnu.org/licenses/>. 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 be46315..ba3a999 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; |