gdb/testsuite/

	* gdb.trace/change-loc.exp (tracepoint_change_loc_1)
	(tracepoint_change_loc_2): Accept both orders of pending set_tracepoint.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8a7d4d81c2220f4c6ad59ad3f8b5e6f32754d47a..0c0c4e40a2459f1caf9635ec6e5dbcc8df04e5dd 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-06  Jan Kratochvil  <[email protected]>
+
+       * 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  <[email protected]>
 
        * 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 a5a982f77b00a2b2d3f073d693d3c2c265787222..db9bdbdb08e3cbda69a8d576c67db5b1c0ec02e5 100644 (file)
--- 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.*\<MULTIPLE\>.*4\.1.* in func4.*4\.2.* in func4.*4\.3.* \<PENDING\>\[\t \]+set_tracepoint.*" \
+\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\<MULTIPLE\>.*4\.1.* in func4.*(4\.2.* in func4.*4\.3.* \<PENDING\>\[\t \]+set_tracepoint|4\.2.* \<PENDING\>\[\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.*\<MULTIPLE\>.*1\.1.* in func4.*1\.2.* in func4.*1\.3.* \<PENDING\>\[\t \]+set_tracepoint.*" \
+\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\<MULTIPLE\>.*1\.1.* in func4.*(1\.2.* in func4.*1\.3.* \<PENDING\>\[\t \]+set_tracepoint|1\.2.* \<PENDING\>\[\t \]+set_tracepoint\r\n1\.3.* in func4).*" \
        "tracepoint with two locations (unload)"
 
     gdb_test_no_output "tstop"