3 files changed, 16 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8c60bdc..6dd14d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18  Stan Shebs  <stan@codesourcery.com>
+
+	* gdb.trace/circ.exp: Test circular-trace-buffer.
+	* gdb.trace/tfile.exp: Update tstatus test.
+
 2010-03-18  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.dwarf2/dw2-anonymous-func.S: New file.
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index d18e7eb..bb3dcd3 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -197,6 +197,15 @@ gdb_load $binfile
 if [target_info exists gdb_stub] {
     gdb_step_for_stub;
 }
+
+gdb_test "set circular-trace-buffer on" "" "set circular-trace-buffer on"
+
+gdb_test "show circular-trace-buffer" "Target's use of circular trace buffer is on." "show circular-trace-buffer (on)"
+
+gdb_test "set circular-trace-buffer off" "" "set circular-trace-buffer off"
+
+gdb_test "show circular-trace-buffer" "Target's use of circular trace buffer is off." "show circular-trace-buffer (off)"
+
 # Body of test encased in a proc so we can return prematurely.
 if { ![gdb_trace_circular_tests] } then {
     # Set trace buffer attributes back to normal
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 398b5ef..f1d86df 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -78,8 +78,8 @@ gdb_test "tfind" "Target failed to find requested trace frame." \
 gdb_test "tstatus" \
     "Using a trace file.*
 Trace stopped by a tstop command.*
-Collected 1 trace frames.*
-Trace buffer has 256 bytes free.*
+Collected 1 trace frame.*
+Trace buffer has 256 bytes of 4096 bytes free \\(93% full\\).*
 Looking at trace frame 0, tracepoint .*" \
     "tstatus on trace file"