diff options
| author | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2018-03-19 13:13:09 +0100 |
|---|---|---|
| committer | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2018-03-19 13:13:09 +0100 |
| commit | 194ed4130dadb7dd1668f6af87405bdcd8041199 (patch) | |
| tree | 1564928c0f3aa70fdbcf37469b43952cf1cca6b6 /gdb/testsuite/gdb.trace/signal.exp | |
| parent | 315aa1cf834a3d78a567263fa3fbda9b2027457e (diff) | |
| download | gdb-194ed4130dadb7dd1668f6af87405bdcd8041199.zip gdb-194ed4130dadb7dd1668f6af87405bdcd8041199.tar.gz gdb-194ed4130dadb7dd1668f6af87405bdcd8041199.tar.bz2 | |
Testsuite: Fix ambiguous "break" due to libinproctrace
Some of GDB's trace test cases define a function end() and place a
breakpoint there with "break end". However, when libinproctrace is linked
to the binary, there are multiple methods named "end", such as
std::string::end() from the C++ library or format_pieces::end() from
common/format.h. GDB then creates multiple breakpoints instead of just a
single one, and some FAILs result, such as these:
FAIL: gdb.trace/trace-mt.exp: ftrace on: break end
FAIL: gdb.trace/trace-mt.exp: ftrace off: break end
Fix this by adding the "-qualified" option to the break commands. For
consistency, change all occurrences of "break end" (and similar) in all
trace test cases, even if the current behavior does not cause problems.
Also, consequently use the gdb_breakpoint convenience proc.
gdb/testsuite/ChangeLog:
* gdb.trace/actions-changed.exp: Call gdb_breakpoint with the
"qualified" option when setting breakpoints.
* gdb.trace/backtrace.exp: Likewise.
* gdb.trace/circ.exp: Likewise.
* gdb.trace/collection.exp: Likewise.
* gdb.trace/disconnected-tracing.exp: Likewise.
* gdb.trace/ftrace-lock.exp: Likewise.
* gdb.trace/ftrace.exp: Likewise.
* gdb.trace/infotrace.exp: Likewise.
* gdb.trace/packetlen.exp: Likewise.
* gdb.trace/passc-dyn.exp: Likewise.
* gdb.trace/qtro.exp: Likewise.
* gdb.trace/read-memory.exp: Likewise.
* gdb.trace/report.exp: Likewise.
* gdb.trace/signal.exp: Likewise.
* gdb.trace/status-stop.exp: Likewise.
* gdb.trace/strace.exp: Likewise.
* gdb.trace/tfind.exp: Likewise.
* gdb.trace/trace-break.exp: Likewise.
* gdb.trace/trace-condition.exp: Likewise.
* gdb.trace/trace-mt.exp: Likewise.
* gdb.trace/tstatus.exp: Likewise.
* gdb.trace/tsv.exp: Likewise.
* gdb.trace/unavailable-dwarf-piece.exp: Likewise.
* gdb.trace/unavailable.exp: Likewise.
* gdb.trace/while-dyn.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.trace/signal.exp')
| -rw-r--r-- | gdb/testsuite/gdb.trace/signal.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp index b233768..b860b12 100644 --- a/gdb/testsuite/gdb.trace/signal.exp +++ b/gdb/testsuite/gdb.trace/signal.exp @@ -66,7 +66,7 @@ if ![runto_main] { return -1 } -gdb_test "break kill" "Breakpoint $decimal at .*" +gdb_breakpoint "kill" qualified gdb_test "handle SIGABRT nostop noprint pass" ".*" "pass SIGABRT" # Hit the breakpoint on $syscall for the first time. In this time, @@ -119,7 +119,7 @@ gdb_test_multiple $test $test { } delete_breakpoints -gdb_test "break start" "Breakpoint $decimal at .*" +gdb_breakpoint "start" qualified gdb_continue_to_breakpoint "continue to start" gdb_assert { 0 == [get_integer_valueof "counter" "1"] } "counter is zero" @@ -135,7 +135,7 @@ set tpnum [get_integer_valueof "\$bpnum" 0] gdb_test "trace *$syscall_insn_next" "Tracepoint $decimal at .*" \ "tracepoint on instruction following syscall instruction" -gdb_test "break end" "Breakpoint $decimal at .*" +gdb_breakpoint "end" qualified gdb_test_no_output "tstart" gdb_test "continue" ".*Breakpoint.* end .*at.*$srcfile.*" \ |