aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-09-23 22:42:10 +0200
committerTom de Vries <tdevries@suse.de>2021-09-23 22:42:10 +0200
commit108e60844c6c517895011f46b74db6b10273be56 (patch)
tree785d8ce89b8c0b33bd7034c0c005a855a8cb7a7b
parent04739cc7ce5a5c67d8d841541a4aaef706c53a79 (diff)
downloadfsf-binutils-gdb-108e60844c6c517895011f46b74db6b10273be56.zip
fsf-binutils-gdb-108e60844c6c517895011f46b74db6b10273be56.tar.gz
fsf-binutils-gdb-108e60844c6c517895011f46b74db6b10273be56.tar.bz2
[gdb/testsuite] Handle failing probe detection in gdb.base/break-probes.exp
When running test-case gdb.base/break-probes.exp on ubuntu 18.04.5, we have: ... (gdb) bt^M #0 0x00007ffff7dd6e12 in ?? () from /lib64/ld-linux-x86-64.so.2^M #1 0x00007ffff7dedf50 in ?? () from /lib64/ld-linux-x86-64.so.2^M #2 0x00007ffff7dd5128 in ?? () from /lib64/ld-linux-x86-64.so.2^M #3 0x00007ffff7dd4098 in ?? () from /lib64/ld-linux-x86-64.so.2^M #4 0x0000000000000001 in ?? ()^M #5 0x00007fffffffdaac in ?? ()^M #6 0x0000000000000000 in ?? ()^M (gdb) FAIL: gdb.base/break-probes.exp: ensure using probes ... The test-case intends to emit an UNTESTED in this case, but fails to do so because it tries to do it in a regexp clause in a gdb_test_multiple, which doesn't trigger. Instead, a default clause triggers which produces the FAIL. Also the use of UNTESTED is not appropriate, and we should use UNSUPPORTED instead. Fix this by silencing the FAIL, and emitting an UNSUPPORTED after the gdb_test_multiple: ... if { ! $using_probes } { + unsupported "probes not present on this system" return -1 } ... Tested on x86_64-linux.
-rw-r--r--gdb/testsuite/gdb.base/break-probes.exp4
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index e115917..ac10ac5 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -52,15 +52,17 @@ set test "ensure using probes"
set using_probes 0
gdb_test_multiple "bt" $test {
-re "#0 +\[^\r\n\]*\\m(__GI_)?$normal_bp\\M.*$gdb_prompt $" {
- untested "probes not present on this system"
}
-re "#0 +\[^\r\n\]*\\m(__GI_)?$probes_bp\\M.*$gdb_prompt $" {
pass $test
set using_probes 1
}
+ -re -wrap "" {
+ }
}
if { ! $using_probes } {
+ unsupported "probes not present on this system"
return -1
}