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.
This commit is contained in:
Marcin Kościelnicki 2016-03-05 18:55:40 +01:00
parent 4366d36e46
commit ba84e0da35
2 changed files with 21 additions and 4 deletions

View File

@ -1,3 +1,8 @@
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.

View File

@ -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"