[gdb/testsuite] Fix captured_command_loop breakpoint in selftests

When building gcc with CFLAGS/CXXFLAGS="-O2 -g", and running the regression
tests, I run into the following FAILs:
...
FAIL: gdb.gdb/complaints.exp: breakpoint in captured_command_loop
FAIL: gdb.gdb/python-interrupts.exp: breakpoint in captured_command_loop
FAIL: gdb.gdb/python-selftest.exp: breakpoint in captured_command_loop
...

The problem is that when setting the breakpoint at captured_command_loop:
...
(gdb) break captured_command_loop^M
Breakpoint 1 at 0x4230ed: captured_command_loop. (2 locations)^M
(gdb) FAIL: gdb.gdb/complaints.exp: breakpoint in captured_command_loop
...
there are two breakpoint locations instead of one.  This is due to
PR26096 - "gdb sets breakpoint at cold clone":
...
$ nm gdb | grep captured_command_loop| c++filt
0000000000659f20 t captured_command_loop()
00000000004230ed t captured_command_loop() [clone .cold]
...

Work around this by allowing multiple breakpoint locations for
captured_command_loop.

Reg-tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-07-29  Tom de Vries  <tdevries@suse.de>

	* lib/selftest-support.exp (selftest_setup): Allow breakpoint at
	multiple locations.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d4d0813fa3da92f9f4784eaf8879a4dc55544830..656e59d54b4bdad5a64b0f05cda69c0e25a2bd60 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-29  Tom de Vries  <tdevries@suse.de>
+
+       * lib/selftest-support.exp (selftest_setup): Allow breakpoint at
+       multiple locations.
+
 2020-07-29  Tom de Vries  <tdevries@suse.de>
 
        * gdb.dwarf2/dw2-line-number-zero.exp: Set breakpoints on lines

diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index 61647d655e32698754c582b4311d9671e99b43e6..450fee1b1e0843383a01ee887e42fe1a63879741 100644 (file)
--- a/gdb/testsuite/lib/selftest-support.exp
+++ b/gdb/testsuite/lib/selftest-support.exp
@@ -76,9 +76,10 @@ proc selftest_setup { executable function } {
        return -1
     }
 
-    # Set a breakpoint at main
+    # Set a breakpoint at main.  Allow more than one location, as
+    # workaround for PR26096 - "gdb sets breakpoint at cold clone".
     gdb_test "break $function" \
-            "Breakpoint.*at.* file.*, line.*" \
+            "Breakpoint.*at.* (file.*, line|locations).*" \
             "breakpoint in $function"
 
     # run yourself