aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2012-04-06 06:42:08 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2012-04-06 06:42:08 +0000
commite127cba8317b3641f8012db22b8008d84002132d (patch)
treeb5290aba46db8c5c440ed20787412340d9b65c06
parentdc4badc33207222b0a11d5ce9f06c30f8d9c3fa1 (diff)
downloadgdb-e127cba8317b3641f8012db22b8008d84002132d.zip
gdb-e127cba8317b3641f8012db22b8008d84002132d.tar.gz
gdb-e127cba8317b3641f8012db22b8008d84002132d.tar.bz2
gdb/testsuite/
* gdb.trace/change-loc.exp (tracepoint_change_loc_1) (tracepoint_change_loc_2): Accept both orders of pending set_tracepoint.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.trace/change-loc.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8a7d4d8..0c0c4e4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-06 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * 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 <keiths@redhat.com>
* 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 a5a982f..db9bdbd 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.*\<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"