2012-02-15 Pedro Alves <palves@redhat.com>

	* gdb.trace/circ.exp (trace_buffer_normal): Rewrite using
	gdb_test_multiple, and call unsupported instead of fail, if the
	remote side does not support the request.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5816b0d33eb79d1b9bad652ca15ec9a82738985b..449b80e778bf94bd62e6dc8862caa8b8fd67cc72 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-15  Pedro Alves  <palves@redhat.com>
+
+       * gdb.trace/circ.exp (trace_buffer_normal): Rewrite using
+       gdb_test_multiple, and call unsupported instead of fail, if the
+       remote side does not support the request.
+
 2012-02-15  Pedro Alves  <palves@redhat.com>
 
        * gdb.server/ext-attach.exp: Make sure gdb is disconnected.

diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 61a523560b4a4f8b6ddad67905dbea487f841e28..4344bebc08694e3fd9c5eb299e081af1aecb725f 100644 (file)
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -88,16 +88,38 @@ proc setup_tracepoints { } {
 
 # return 0 for success, 1 for failure
 proc trace_buffer_normal { } {
-    if [gdb_test "maint packet QTBuffer:size:ffffffff" \
-           "received: .OK." ""] then { 
-       pass "This test cannot be run on this target"
+    global gdb_prompt
+
+    set ok 0
+    set test "maint packet QTBuffer:size:ffffffff"
+    gdb_test_multiple $test $test {
+       -re "received: .OK.\r\n$gdb_prompt $" {
+           set ok 1
+           pass $test
+       }
+       -re "\r\n$gdb_prompt $" {
+       }
+    }
+    if { !$ok } {
+       unsupported $test
        return 1;
     }
-    if [gdb_test "maint packet QTBuffer:circular:0" \
-           "received: .OK." ""] then { 
-       pass "This test cannot be run on this target"
+
+    set ok 0
+    set test "maint packet QTBuffer:circular:0"
+    gdb_test_multiple $test $test {
+       -re "received: .OK.\r\n$gdb_prompt $" {
+           set ok 1
+           pass $test
+       }
+       -re "\r\n$gdb_prompt $" {
+       }
+    }
+    if { !$ok } {
+       unsupported $test
        return 1;
     }
+
     return 0;
 }