[committed][gdb/testsuite] Fix captured_command_loop breakpoint in selftests

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[committed][gdb/testsuite] Fix captured_command_loop breakpoint in selftests

Tom de Vries
Hi,

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.

Committed to trunk.

Thanks,
- Tom

[gdb/testsuite] Fix captured_command_loop breakpoint in selftests

gdb/testsuite/ChangeLog:

2020-07-29  Tom de Vries  <[hidden email]>

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

---
 gdb/testsuite/lib/selftest-support.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index 61647d655e..450fee1b1e 100644
--- 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