[committed,gdb/testsuite] Fix gdb.cp/cplusfuncs.exp with check-read1

Message ID 20210610053648.GA24229@delia
State New
Headers show
Series
  • [committed,gdb/testsuite] Fix gdb.cp/cplusfuncs.exp with check-read1
Related show

Commit Message

Tom de Vries June 10, 2021, 5:36 a.m.
Hi,

When running check-read1, we run into:
...
FAIL: gdb.cp/cplusfuncs.exp: info function for "operator=(" (timeout)
...

Fix this by using using gdb_test_lines in info_func_regexp.

Tested on x86_64-linux.

Committed to trunk.

Thanks,
- Tom

[gdb/testsuite] Fix gdb.cp/cplusfuncs.exp with check-read1

gdb/testsuite/ChangeLog:

2021-06-09  Tom de Vries  <tdevries@suse.de>

	* gdb.cp/cplusfuncs.exp (info_func_regexp): Use gdb_test_lines.

---
 gdb/testsuite/gdb.cp/cplusfuncs.exp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Patch

diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index f1c2ff4907f..19be8abc2ac 100644
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -287,13 +287,16 @@  proc probe_demangler { } {
 #
 
 proc info_func_regexp { name demangled } {
-    global gdb_prompt
+    global srcfile decimal
 
     regsub {\\\(void\\\)} $demangled {\(\)} demangled
 
-    gdb_test "info function $name" \
-	"File .*:\t(class|)${demangled}.*" \
-	"info function for \"$name\""
+    set file_re "File .*[string_to_regexp $srcfile]:"
+
+    gdb_test_lines "info function $name" "info function for \"$name\"" \
+	[list \
+	     "$file_re" \
+	     "$decimal:\t(class|)${demangled}.*"]
 }
 
 #