From: Tom de Vries <tdevries@suse.de>
Date: Thu, 28 Jan 2021 07:14:58 +0000 (+0100)
Subject: [gdb/testsuite] Fix gdb.ada/out_of_line_in_inlined.exp with -m32 and gcc-10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f985dd1acf41d6b52ee2433f09a5fcc0244456a;p=binutils-gdb.git

[gdb/testsuite] Fix gdb.ada/out_of_line_in_inlined.exp with -m32 and gcc-10

When running test-case gdb.ada/out_of_line_in_inlined.exp with target board
unix/-m32 on a system with gcc-10 default compiler, we run into:
...
(gdb) break foo_o224_021.child1.child2^M
Breakpoint 1 at 0x804ba59: foo_o224_021.child1.child2. (3 locations)^M
(gdb) FAIL: gdb.ada/out_of_line_in_inlined.exp: scenario=all: \
  break foo_o224_021.child1.child2
...

The test does not expect the "3 locations" part.

Fix this by using gdb_breakpoint instead of gdb_test.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-01-28  Tom de Vries  <tdevries@suse.de>

	* gdb.ada/out_of_line_in_inlined.exp: Use gdb_breakpoint.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9256c071746..ddb8f8b36fe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-28  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.ada/out_of_line_in_inlined.exp: Use gdb_breakpoint.
+
 2021-01-28  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.dwarf2/dw2-out-of-range-end-of-seq.exp: Add regexp to
diff --git a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
index f3c8fdcf919..fa8f04e4cb2 100644
--- a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
+++ b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
@@ -30,8 +30,7 @@ foreach_with_prefix scenario {all minimal} {
 
     clean_restart ${testfile}
 
-    gdb_test "break foo_o224_021.child1.child2" \
-	"Breakpoint \[0-9\]+ at.*: file .*foo_o224_021.adb, line \[0-9\]+."
+    gdb_breakpoint "foo_o224_021.child1.child2"
 
     gdb_run_cmd
     gdb_test "" \