diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2016-03-05 18:55:40 +0100 |
|---|---|---|
| committer | Marcin Kościelnicki <koriakin@0x04.net> | 2016-03-09 18:45:19 +0100 |
| commit | ba84e0da35d29dd8969a4bcdd84e3eaa48927a84 (patch) | |
| tree | 0f6cb308457a60c4426f8fc8a3b81f1aecf424dd | |
| parent | 4366d36e467bf81274edccbea026a91188cc67e3 (diff) | |
| download | binutils-gdb-ba84e0da35d29dd8969a4bcdd84e3eaa48927a84.tar.gz | |
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.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 ce2a190d3fa..fe68a01df06 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-03-09 Marcin Kościelnicki <koriakin@0x04.net> + * gdb.trace/change-loc.exp: Don't depend on tracepoint location + ordering. + +2016-03-09 Marcin Kościelnicki <koriakin@0x04.net> + * gdb.trace/unavailable-dwarf-piece.c (foo): Add foo_start_lbl label. (bar): Add bar_start_lbl label. * gdb.trace/unavailable-dwarf-piece.exp: Use foo/bar_start_lbl instead diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 80beb4de6e4..c4e0b4bafeb 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.*\<MULTIPLE\>.* -4\.1.* in func4.*\tinstalled on target\r\n(4\.2.* in func4.*\tinstalled on target\r\n4\.3.* \<PENDING\>\[\t \]+set_tracepoint|4\.2.* \<PENDING\>\[\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.*\<MULTIPLE\>.* +4\.\[1-3].* \<PENDING\>\[\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.*\<MULTIPLE\>.* -1\.1.* in func4.*\tinstalled on target\r\n(1\.2.* in func4.*\tinstalled on target\r\n1\.3.* \<PENDING\>\[\t \]+set_tracepoint|1\.2.* \<PENDING\>\[\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.*\<MULTIPLE\>.* +1\.\[1-3].* \<PENDING\>\[\t \]+set_tracepoint.*" \ + "tracepoint with two locations - pending (unload)" gdb_test_no_output "tstop" |