aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-09-29 15:53:52 +0200
committerTom de Vries <tdevries@suse.de>2021-09-29 15:53:52 +0200
commitf15ec499bf8c5328679e3f745b78ef03b83d6510 (patch)
treed8dccc0aa9154f71a6df03b12fcd96b5edc9c97f
parent74ea3b51c3b76fc0ccd46cc755e6e85e4570515b (diff)
downloadgdb-f15ec499bf8c5328679e3f745b78ef03b83d6510.zip
gdb-f15ec499bf8c5328679e3f745b78ef03b83d6510.tar.gz
gdb-f15ec499bf8c5328679e3f745b78ef03b83d6510.tar.bz2
[gdb/testsuite] Fix breakpoint detection in gdb.gdb/python-helper.exp
With a gdb configured to be somewhat minimal, while still supporting python: ... $ gdb --configuration This GDB was configured as follows: configure --host=x86_64-pc-linux-gnu --target=x86_64-pc-linux-gnu --with-auto-load-dir=$debugdir:$datadir/auto-load --with-auto-load-safe-path=$debugdir:$datadir/auto-load --without-expat --with-gdb-datadir=$install/share/gdb (relocatable) --with-jit-reader-dir=$install/lib64/gdb (relocatable) --without-libunwind-ia64 --without-lzma --without-babeltrace --without-intel-pt --with-mpfr --without-xxhash --with-python=/usr --with-python-libdir=/usr/lib --with-debuginfod --without-guile --disable-source-highlight --with-separate-debug-dir=/usr/lib/debug --with-system-gdbinit=$devel/system-gdbinit ... and using gcc 4.8 to build gdb (causing std::thread not to be used due to PR28318) I ran into: ... (gdb) PASS: gdb.gdb/python-helper.exp: start inner gdb print 1^M ^M Breakpoint 2, value_print () at src/gdb/valprint.c:1174^M 1174 scoped_value_mark free_values;^M (xgdb) FAIL: gdb.gdb/python-helper.exp: hit breakpoint in inner gdb (timeout) ... The problem is that the regexp expects "hit Breakpoint $decimal". The "hit" part is missing. The "hit" is printed by maybe_print_thread_hit_breakpoint, when show_thread_that_caused_stop returns true: ... int show_thread_that_caused_stop (void) { return highest_thread_num > 1; } ... Apparently, that's not the case. Fix this by removing "hit" from the regexp, making the regexp more similar to what is used in say, continue_to_breakpoint. Tested on x86_64-linux.
-rw-r--r--gdb/testsuite/gdb.gdb/python-helper.exp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.gdb/python-helper.exp b/gdb/testsuite/gdb.gdb/python-helper.exp
index 54c256e..7013a3a 100644
--- a/gdb/testsuite/gdb.gdb/python-helper.exp
+++ b/gdb/testsuite/gdb.gdb/python-helper.exp
@@ -92,7 +92,7 @@ proc test_python_helper {} {
# just created.
send_inferior "print 1\n"
gdb_test_multiple "" "hit breakpoint in inner gdb" {
- -re "hit Breakpoint $decimal, value_print.*\\(xgdb\\) $" {
+ -re "Breakpoint $decimal, value_print.*\\(xgdb\\) $" {
pass $gdb_test_name
}
}