This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] testsuite: change-loc.exp: Fix false random FAILs
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 6 Apr 2012 08:44:35 +0200
- Subject: [commit] testsuite: change-loc.exp: Fix false random FAILs
Hi,
for <MULTIPLE> breakpoint I do not think the testsuite should depend on the
order of found locations. Although maybe GDB could sort them?
The fix does not handle mix with the first location.
@@ -176,8 +176,8 @@ Num Type Disp Enb Address
4 tracepoint keep y <MULTIPLE> ^M
collect $rip^M
4.1 y 0x0000000000400796 in func4 at ./gdb.trace/change-loc.h:35^M
-4.2 y 0x00007ffff7bdc6ba in func4 at ./gdb.trace/change-loc.h:35^M
-4.3 y 0x00007ffff712666a in func4 at ./gdb.trace/change-loc.h:35^M
+4.2 y 0x00007ffff712666a in func4 at ./gdb.trace/change-loc.h:35^M
+4.3 y 0x00007ffff7bdc6ba in func4 at ./gdb.trace/change-loc.h:35^M
(gdb) PASS: gdb.trace/change-loc.exp: 1 trace: tracepoint with three locations
continue^M
Continuing.^M
@@ -192,9 +192,9 @@ Num Type Disp Enb Address
4 tracepoint keep y <MULTIPLE> ^M
collect $rip^M
4.1 y 0x0000000000400796 in func4 at ./gdb.trace/change-loc.h:35^M
-4.2 y 0x00007ffff7bdc6ba in func4 at ./gdb.trace/change-loc.h:35^M
-4.3 y <PENDING> set_tracepoint^M
-(gdb) PASS: gdb.trace/change-loc.exp: 1 trace: tracepoint with two locations (unload)
+4.2 y <PENDING> set_tracepoint^M
+4.3 y 0x00007ffff7bdc6ba in func4 at ./gdb.trace/change-loc.h:35^M
+(gdb) FAIL: gdb.trace/change-loc.exp: 1 trace: tracepoint with two locations (unload)
tstop^M
(gdb) PASS: gdb.trace/change-loc.exp: 1 trace: tstop
tfind^M
Checked in.
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2012-04/msg00026.html
--- src/gdb/testsuite/ChangeLog 2012/04/05 18:50:28 1.3155
+++ src/gdb/testsuite/ChangeLog 2012/04/06 06:42:08 1.3156
@@ -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
--- src/gdb/testsuite/gdb.trace/change-loc.exp 2012/03/09 03:47:15 1.7
+++ src/gdb/testsuite/gdb.trace/change-loc.exp 2012/04/06 06:42:08 1.8
@@ -156,7 +156,7 @@
# 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 @@
# 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"