From c5facdc449f43f79a7db6d7ec418caac18aa5c94 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 20 Feb 2015 23:10:53 +0000 Subject: [PATCH] Fix gdb.base/solib-corrupted.exp after dtrace probes changes Commit 6f9b8491 (Adapt `info probes' to support printing probes of different types.) added a new type column to "info probes". That caused a solib-corrupted.exp regression: ~~~~~~~~~~~~~~~~~~~~~ Running /home/pedro/gdb/mygit/src/gdb/testsuite/gdb.base/solib-corrupted.exp ... FAIL: gdb.base/solib-corrupted.exp: corrupted list === gdb Summary === # of expected passes 2 # of unexpected failures 1 ~~~~~~~~~~~~~~~~~~~~~ Tested on x86_64 Fedora 20. gdb/testsuite/ChangeLog: 2015-02-20 Pedro Alves * gdb.base/solib-corrupted.exp: Expect "stap" as first column of info probes. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/solib-corrupted.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2ea6940ac16..1e1ee536745 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-02-20 Pedro Alves + + * gdb.base/solib-corrupted.exp: Expect "stap" as first column of + info probes. + 2015-02-20 Pedro Alves * gdb.threads/multi-create-ns-info-thr.exp: New file. diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp index 33192bc9713..3e3a6bb86fd 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -44,7 +44,7 @@ set probes { init_start init_complete map_start reloc_complete unmap_start unmap_complete } set test "info probes" gdb_test_multiple $test $test { - -re "^rtld\[ \t\]+(?:rtld_)?(\[a-z_\]+)\[ \t\]" { + -re "^stap\[ \t\]+rtld\[ \t\]+(?:rtld_)?(\[a-z_\]+)\[ \t\]" { set idx [lsearch -exact $probes $expect_out(1,string)] if { $idx >= 0 } { set probes [lreplace $probes $idx $idx] -- 2.30.2