diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/ftrace.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/pending.exp | 18 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/trace-break.exp | 36 |
4 files changed, 41 insertions, 22 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8b39bb3..d4a8819 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-01-19 Marcin Kościelnicki <koriakin@0x04.net> + + * gdb.trace/ftrace.exp: Fix expected message on continue. + * gdb.trace/pending.exp: Fix expected message on continue. + * gdb.trace/trace-break.exp: Fix expected message on continue. + 2016-01-18 Simon Marchi <simon.marchi@ericsson.com> * lib/gdb.exp (gdb_test): Remove unused global references. diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index 33fc284..15ad7e7 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -202,7 +202,8 @@ proc test_ftrace_condition { condexp var list } \ "collect $var" "^$" gdb_test_no_output "tstart" "" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "" + gdb_test "continue" \ + "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" "" gdb_test_no_output "tstop" "" set i 0 diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp index 0393ebd..98e17f7 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -154,7 +154,7 @@ proc pending_tracepoint_works { trace_type } { } - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*$srcfile.*" \ "continue to marker" gdb_test "tstop" "\[\r\n\]+" "stop trace experiment" @@ -204,7 +204,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \ gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*pending.c.*" \ "continue to marker 1" set test "continue to marker 2" @@ -264,7 +264,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \ gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*${srcfile}.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*${srcfile}.*" \ "continue to marker 1" # Set a pending tracepoint during a tracing experiment. @@ -294,7 +294,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \ fail $test } } - -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { + -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\n(Thread .* hit )?Breakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { pass $test } } @@ -341,7 +341,7 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \ gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*pending.c.*" \ "continue to marker" set test "disconnect with pending tracepoint" @@ -389,9 +389,9 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \ gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*pending.c.*" \ "continue to marker 1" - gdb_test "continue" "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\nBreakpoint.*marker.*at.*pending.c.*" \ + gdb_test "continue" "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\n(Thread .* hit )?Breakpoint.*marker.*at.*pending.c.*" \ "continue to marker 2" # There should be no pending tracepoint, so no warning should be emitted. @@ -450,7 +450,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \ gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \ + gdb_test "continue" "Continuing.\r\n\r\n(Thread .* hit )?Breakpoint.*marker.*at.*pending.c.*" \ "continue to marker 1" set test "continue to marker 2" @@ -467,7 +467,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \ fail $test } } - -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { + -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\n(Thread .* hit )?Breakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { pass "continue to marker 2" } diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp index af6f425..a264822 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -61,9 +61,11 @@ proc break_trace_same_addr_1 { trace_type option } \ gdb_test_no_output "tstart" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to set_point" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to set_point" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test_no_output "tstop" gdb_test "tfind" "Found trace frame 0, tracepoint .*" "tfind frame 0" @@ -98,7 +100,8 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \ "${trace_type2} set_point (2)" gdb_test_no_output "tstart" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test_no_output "tstop" @@ -132,10 +135,12 @@ proc break_trace_same_addr_3 { trace_type option } \ gdb_test_no_output "tstart" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to marker" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to marker" gdb_test "delete break 4" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test_no_output "tstop" gdb_test "tfind" "Found trace frame 0, tracepoint .*" "tfind frame 0" @@ -166,14 +171,17 @@ proc break_trace_same_addr_4 { trace_type option } \ gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to marker" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to marker" # Delete tracepoint set on set_point. gdb_test "delete trace 5" gdb_test "tstart" "No tracepoints defined, not starting trace.*" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to set_point" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to set_point" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test "tstop" "Trace is not running.*" gdb_test "tfind" "Target failed to find requested trace frame\\..*" @@ -216,7 +224,8 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \ gdb_test_no_output "tstart" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to marker" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to marker" if [string equal $trace3_at_first_loc "1"] { gdb_test "${trace3} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \ @@ -229,7 +238,8 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \ gdb_trace_setactions "set action for tracepoint 3" "" \ "collect \$$fpreg" "^$" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test_no_output "tstop" gdb_test "tfind tracepoint 4" "Found trace frame \[0-9\], tracepoint .*" \ @@ -275,7 +285,8 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to marker" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to marker" gdb_test "${trace1} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \ "${trace1} set_point 1" @@ -290,7 +301,8 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ gdb_test_no_output "$enable2 5" gdb_test_no_output "tstart" - gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" + gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ + "continue to end" gdb_test_no_output "tstop" |