7 files changed, 21 insertions, 17 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cf6bab0..89d1347 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-02  Michael Snyder  <msnyder@vmware.com>
 
+	* gdb.trace/actions.exp: Use gdb_test_no_output.
+	* gdb.trace/circ.exp: Ditto.
+	* gdb.trace/packetlen.exp: Ditto.
+	* gdb.trace/save-trace.exp: Ditto.
+	* gdb.trace/tracecmd.exp: Ditto.
+	* gdb.trace/tsv.exp: Ditto.
+
 	* gdb.threads/fork-thread-pending.exp: Use gdb_test_no_output.
 	* gdb.threads/hand-call-in-thraeds.exp: Ditto.
 	* gdb.threads/local-watch-wrong-thread.exp: Ditto.
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index c805a0a..2fbca8f 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -192,16 +192,14 @@ gdb_test "help end" "Ends a list of commands or actions.*" \
 
 # 5.9 default-collect
 
-gdb_test "set default-collect gdb_char_test, gdb_long_test - 100" \
-    "" \
+gdb_test_no_output "set default-collect gdb_char_test, gdb_long_test - 100" \
     "5.9a: set default-collect"
 
 gdb_test "show default-collect" \
     "The list of expressions to collect by default is \"gdb_char_test, gdb_long_test - 100\"..*" \
     "5.9b: show default-collect"
 
-gdb_test "set default-collect" \
-    "" \
+gdb_test_no_output "set default-collect" \
     "5.9c: set default-collect"
 
 # 5.10 teval
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 62f6dad..2cc360f 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -196,11 +196,13 @@ if [target_info exists gdb_stub] {
     gdb_step_for_stub;
 }
 
-gdb_test "set circular-trace-buffer on" "" "set circular-trace-buffer on"
+gdb_test_no_output "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_no_output "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)"
 
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 4678495..3a7ab3a 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -60,11 +60,11 @@ gdb_trace_setactions "setup collect actions" \
 	"collect gdb_structp_test, gdb_structpp_test, gdb_union1_test" "^$" \
 	"end" ""
 
-gdb_test "tstart" "" "survive the long packet send"
+gdb_test_no_output "tstart" "survive the long packet send"
 gdb_test "break end" "" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
 
-gdb_test "tstop" "" "confirm: survived the long packet send"
+gdb_test_no_output "tstop" "confirm: survived the long packet send"
 
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 8c18d03..b1616a6 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -71,8 +71,7 @@ foreach x { 1 2 3 4 5 6 } {
 	     "Setting tracepoint $trcpt.* to $x" \
 	     "10.x: set passcount for tracepoint $trcpt"
 
-    gdb_test "condition $trcpt $x - 1 == $x / 2" \
-	     "" \
+    gdb_test_no_output "condition $trcpt $x - 1 == $x / 2" \
 	     "10.x: set condition for tracepoint $trcpt"
 
     gdb_trace_setactions "10.x: set actions for tracepoint $x" \
@@ -83,8 +82,7 @@ foreach x { 1 2 3 4 5 6 } {
 	    "end" "^$"
 }
 
-gdb_test "set default-collect gdb_char_test, gdb_long_test - 100" \
-    "" \
+gdb_test_no_output "set default-collect gdb_char_test, gdb_long_test - 100" \
     "10: set default-collect"
 
 proc gdb_verify_tracepoints { testname } {
@@ -132,7 +130,7 @@ gdb_test "save-tracepoints savetrace.tr" \
 # 10.2 Read back tracepoint definitions
 
 gdb_delete_tracepoints
-gdb_test "set default-collect" "" "10.2: clear default-collect"
+gdb_test_no_output "set default-collect" "10.2: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.2: delete tracepoints"
 gdb_test "source savetrace.tr" \
 	"Tracepoint \[0-9\]+ at .*" \
@@ -149,7 +147,7 @@ gdb_test "save-tracepoints $objdir/savetrace.tr" \
 	"10.3: save tracepoint definitions, full path"
 
 gdb_delete_tracepoints
-gdb_test "set default-collect" "" "10.3: clear default-collect"
+gdb_test_no_output "set default-collect" "10.3: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
 gdb_test "source $objdir/savetrace.tr" \
 	"Tracepoint \[0-9\]+ at .*" \
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 5590f88..7778383 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -80,7 +80,7 @@ gdb_test "info trace" "No tracepoints.*" \
 
 # 1.3 trace line in invalid source file
 gdb_delete_tracepoints
-gdb_test "set breakpoint pending off" ""
+gdb_test_no_output "set breakpoint pending off"
 gdb_test "trace NoSuChFiLe.c:1" "No source file named NoSuChFiLe.c." \
 	"1.3a: trace invalid source file"
 gdb_test "info trace" "No tracepoints.*" \
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 6829d76..96c330b 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -72,8 +72,7 @@ gdb_test "info tvariables" \
 \\\$tvar3\[\t \]+1234567000000\[\t \]+.*<undefined>.*" \
   "List tvariables"
 
-gdb_test "delete tvariable \$tvar2" \
-  "" \
+gdb_test_no_output "delete tvariable \$tvar2" \
   "delete trace state variable"
 
 gdb_test "info tvariables" \