From e127cba8317b3641f8012db22b8008d84002132d Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 6 Apr 2012 06:42:08 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.trace/change-loc.exp (tracepoint_change_loc_1) (tracepoint_change_loc_2): Accept both orders of pending set_tracepoint. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/change-loc.exp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8a7d4d81c22..0c0c4e40a24 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-04-06 Jan Kratochvil + + * gdb.trace/change-loc.exp (tracepoint_change_loc_1) + (tracepoint_change_loc_2): Accept both orders of pending set_tracepoint. + 2012-04-05 Keith Seitz * gdb.base/advance.exp: Update error message for diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index a5a982f77b0..db9bdbdb08e 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -156,7 +156,7 @@ proc tracepoint_change_loc_1 { trace_type } { with_test_prefix "1 $trace_type" { # shlib is unloaded, there are still three locations, but one is pending. gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*4\.1.* in func4.*4\.2.* in func4.*4\.3.* \\[\t \]+set_tracepoint.*" \ +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*4\.1.* in func4.*(4\.2.* in func4.*4\.3.* \\[\t \]+set_tracepoint|4\.2.* \\[\t \]+set_tracepoint\r\n4\.3.* in func4).*" \ "tracepoint with two locations (unload)" gdb_test_no_output "tstop" @@ -260,7 +260,7 @@ proc tracepoint_change_loc_2 { trace_type } { with_test_prefix "2 $trace_type" { # shlib is unloaded, there are still three locations, but one is pending. gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*1\.1.* in func4.*1\.2.* in func4.*1\.3.* \\[\t \]+set_tracepoint.*" \ +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*1\.1.* in func4.*(1\.2.* in func4.*1\.3.* \\[\t \]+set_tracepoint|1\.2.* \\[\t \]+set_tracepoint\r\n1\.3.* in func4).*" \ "tracepoint with two locations (unload)" gdb_test_no_output "tstop" -- 2.47.2