Message ID | 20181223202308.31611-1-philippe.waroquiers@skynet.be |
---|---|
State | New |
Headers | show |
Hi Philippe, On Sun, Dec 23, 2018 at 09:23:08PM +0100, Philippe Waroquiers wrote: > 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) Ah, my evil twin was so naive, back then... > 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-23 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. Thank you for the patch. This is OK. > --- > gdb/testsuite/gdb.ada/bp_fun_addr.exp | 10 +++++----- > .../gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} | 4 ++-- > 2 files changed, 7 insertions(+), 7 deletions(-) > rename gdb/testsuite/gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} (94%) > > 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/bp_fun_addr.adb > similarity index 94% > rename from gdb/testsuite/gdb.ada/bp_fun_addr/a.adb > rename to gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb > index 00e2e86355..2faf6da843 100644 > --- a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb > +++ b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb > @@ -13,7 +13,7 @@ > -- 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 > +procedure Bp_Fun_Addr is > begin > null; > -end A; > +end Bp_Fun_Addr; > -- > 2.19.2
On Mon, 2018-12-24 at 06:56 +0400, Joel Brobecker wrote: > > 2018-12-23 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. > > Thank you for the patch. This is OK. Thanks for the review, pushed. (I think they are one or two other tests failing for similar conflict, so I will submit other patches for these). Philippe
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/bp_fun_addr.adb similarity index 94% rename from gdb/testsuite/gdb.ada/bp_fun_addr/a.adb rename to gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb index 00e2e86355..2faf6da843 100644 --- a/gdb/testsuite/gdb.ada/bp_fun_addr/a.adb +++ b/gdb/testsuite/gdb.ada/bp_fun_addr/bp_fun_addr.adb @@ -13,7 +13,7 @@ -- 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 +procedure Bp_Fun_Addr is begin null; -end A; +end Bp_Fun_Addr;
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-23 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. --- gdb/testsuite/gdb.ada/bp_fun_addr.exp | 10 +++++----- .../gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename gdb/testsuite/gdb.ada/bp_fun_addr/{a.adb => bp_fun_addr.adb} (94%)