From ba84e0da35d29dd8969a4bcdd84e3eaa48927a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Sat, 5 Mar 2016 18:55:40 +0100 Subject: [PATCH] gdb.trace/change-loc.exp: Don't depend on tracepoint ordering. powerpc (32-bit) loads shared libraries below the main executable, so the PENDING location is the first one, which the current regex doesn't match. Split it into two tests instead, one looking for the pending tracepoint location, and the other for two installed locations. gdb/testsuite/ChangeLog: * gdb.trace/change-loc.exp: Don't depend on tracepoint location ordering. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/change-loc.exp | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ce2a190d3f..fe68a01df0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-03-09 Marcin Kościelnicki + + * gdb.trace/change-loc.exp: Don't depend on tracepoint location + ordering. + 2016-03-09 Marcin Kościelnicki * gdb.trace/unavailable-dwarf-piece.c (foo): Add foo_start_lbl label. diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 80beb4de6e..c4e0b4bafe 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -152,8 +152,14 @@ proc tracepoint_change_loc_1 { trace_type } { gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* -4\.1.* in func4.*\tinstalled on target\r\n(4\.2.* in func4.*\tinstalled on target\r\n4\.3.* \\[\t \]+set_tracepoint|4\.2.* \\[\t \]+set_tracepoint.*4\.3.* in func4.*\tinstalled on target).*" \ - "tracepoint with two locations (unload)" +(4\.\[1-3].* in func4.*\tinstalled on target.*){2}" \ + "tracepoint with two locations - installed (unload)" + + gdb_test "info trace" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +4\.\[1-3].* \\[\t \]+set_tracepoint.*" \ + "tracepoint with two locations - pending (unload)" gdb_test_no_output "tstop" @@ -262,8 +268,14 @@ proc tracepoint_change_loc_2 { trace_type } { gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* -1\.1.* in func4.*\tinstalled on target\r\n(1\.2.* in func4.*\tinstalled on target\r\n1\.3.* \\[\t \]+set_tracepoint|1\.2.* \\[\t \]+set_tracepoint\r\n1\.3.* in func4.*\tinstalled on target).*" \ - "tracepoint with two locations (unload)" +(1\.\[1-3].* in func4.*\tinstalled on target.*){2}" \ + "tracepoint with two locations - installed (unload)" + + gdb_test "info trace" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +1\.\[1-3].* \\[\t \]+set_tracepoint.*" \ + "tracepoint with two locations - pending (unload)" gdb_test_no_output "tstop"