[RFAv2,4/4] Fix gdb.ada/fun_renaming.exp by using more unique names.
Commit Message
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.
---
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(-)
Comments
> 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.
Thank you, Philippe. This is OK as well.
On Thu, 2018-12-27 at 06:38 +0400, Joel Brobecker wrote:
> > 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.
>
> Thank you, Philippe. This is OK as well.
Thanks for the reviews, I have pushed the 4 patches.
Philippe
@@ -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 {
@@ -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;
@@ -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
@@ -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;