From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sun, 23 Dec 2018 20:05:58 +0000 (+0100)
Subject: Fix gdb.ada bp_fun_addr failure due to conflict between fun 'a' and s-dimmks.ads... 
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=b5a1e55720f294fd0d5e1ebc21ccc01083751acd;p=deliverable%2Fbinutils-gdb.git

Fix gdb.ada bp_fun_addr failure due to conflict between fun 'a' and s-dimmks.ads 'A'.

The test fails (timeout) due to:
  (gdb) PASS: gdb.ada/bp_fun_addr.exp: break *a'address
  run
  Starting program: /bd/home/philippe/gdb/git/build_info_t/gdb/testsuite/outputs/gdb.ada/bp_fun_addr/a
  Multiple matches for a
  [0] cancel
  [1] a at /bd/home/philippe/gdb/git/info_t/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb:18
  [2] system.dim.mks.a at s-dimmks.ads:115
  > FAIL: gdb.ada/bp_fun_addr.exp: run until breakpoint at a'address (timeout)
  testcase /home/philippe/gdb/git/build_info_t/gdb/testsuite/../../../info_t/gdb/testsuite/gdb.ada/bp_fun_addr.exp completed in 10 seconds

Fix this by using a fun name that has more chances to be unique.

2018-12-24  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdb.ada/bp_fun_addr/a.adb (a): Rename to bp_fun_addr.
	Filename a.adb changed to bp_fun_addr.adb.
	gdb.ada/bp_fun_addr.exp: Update test accordingly.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1ac687e17d..fda5318990 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-24  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+	* gdb.ada/bp_fun_addr/a.adb (a): Rename to bp_fun_addr.
+	Filename a.adb changed to bp_fun_addr.adb.
+	gdb.ada/bp_fun_addr.exp: Update test accordingly.
+
 2018-12-21  Jan Vrany  <jan.vrany@fit.cvut.cz>
 
 	* lib/gdb.exp (gdb_compile): Add new nopie flag enforce
diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr.exp b/gdb/testsuite/gdb.ada/bp_fun_addr.exp
index b037d43538..38a2609677 100644
--- a/gdb/testsuite/gdb.ada/bp_fun_addr.exp
+++ b/gdb/testsuite/gdb.ada/bp_fun_addr.exp
@@ -17,7 +17,7 @@ load_lib "ada.exp"
 
 if { [skip_ada_tests] } { return -1 }
 
-standard_ada_testfile a
+standard_ada_testfile bp_fun_addr
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
@@ -25,11 +25,11 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 
 clean_restart ${testfile}
 
-gdb_test "break *a'address" \
-         "Breakpoint \[0-9\]+ at.*: file .*a.adb, line \[0-9\]+."
+gdb_test "break *bp_fun_addr'address" \
+         "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+."
 
 gdb_run_cmd
 gdb_test "" \
-         "Breakpoint $decimal, a \\(\\).*" \
-         "run until breakpoint at a'address"
+         "Breakpoint $decimal, bp_fun_addr \\(\\).*" \
+         "run until breakpoint at bp_fun_addr'address"
 
diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb b/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb
deleted file mode 100644
index 00e2e86355..0000000000
--- a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb
+++ /dev/null
@@ -1,19 +0,0 @@
---  Copyright 2016-2018 Free Software Foundation, Inc.
---
---  This program is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 3 of the License, or
---  (at your option) any later version.
---
---  This program is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
---
---  You should have received a copy of the GNU General Public License
---  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-procedure A is
-begin
-   null;
-end A;
diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb
new file mode 100644
index 0000000000..2faf6da843
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb
@@ -0,0 +1,19 @@
+--  Copyright 2016-2018 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+procedure Bp_Fun_Addr is
+begin
+   null;
+end Bp_Fun_Addr;