[RFA] gdb.trace, use gdb_test_no_output

[RFA] gdb.trace, use gdb_test_no_output

[Michael Snyder]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: trace2.exp.txt --]
[-- Type: text/plain, Size: 6145 bytes --]

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.

Index: gdb.trace/actions.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/actions.exp,v
retrieving revision 1.20
diff -u -p -r1.20 actions.exp
--- gdb.trace/actions.exp	2 Jun 2010 19:41:11 -0000	1.20
+++ gdb.trace/actions.exp	2 Jun 2010 20:18:38 -0000
@@ -192,16 +192,14 @@ gdb_test "help end" "Ends a list of comm
 
 # 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
Index: gdb.trace/circ.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/circ.exp,v
retrieving revision 1.14
diff -u -p -r1.14 circ.exp
--- gdb.trace/circ.exp	5 May 2010 18:07:04 -0000	1.14
+++ gdb.trace/circ.exp	2 Jun 2010 20:18:38 -0000
@@ -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)"
 
Index: gdb.trace/packetlen.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/packetlen.exp,v
retrieving revision 1.13
diff -u -p -r1.13 packetlen.exp
--- gdb.trace/packetlen.exp	5 May 2010 18:07:04 -0000	1.13
+++ gdb.trace/packetlen.exp	2 Jun 2010 20:18:38 -0000
@@ -60,11 +60,11 @@ gdb_trace_setactions "setup collect acti
 	"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"
 
Index: gdb.trace/save-trace.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/save-trace.exp,v
retrieving revision 1.19
diff -u -p -r1.19 save-trace.exp
--- gdb.trace/save-trace.exp	2 Jun 2010 19:41:11 -0000	1.19
+++ gdb.trace/save-trace.exp	2 Jun 2010 20:18:38 -0000
@@ -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/savet
 	"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 .*" \
Index: gdb.trace/tracecmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/tracecmd.exp,v
retrieving revision 1.19
diff -u -p -r1.19 tracecmd.exp
--- gdb.trace/tracecmd.exp	2 Jun 2010 19:41:11 -0000	1.19
+++ gdb.trace/tracecmd.exp	2 Jun 2010 20:18:38 -0000
@@ -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.*" \
Index: gdb.trace/tsv.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/tsv.exp,v
retrieving revision 1.4
diff -u -p -r1.4 tsv.exp
--- gdb.trace/tsv.exp	2 Jun 2010 19:41:11 -0000	1.4
+++ gdb.trace/tsv.exp	2 Jun 2010 20:18:38 -0000
@@ -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" \

Re: [RFA] gdb.trace, use gdb_test_no_output

[Joel Brobecker]

> 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.

This looks fine, but I'm going to defer to Pedro or Stan, who know
tracepoints better than I do.

-- 
Joel

Re: [RFA] gdb.trace, use gdb_test_no_output

[Pedro Alves]

On Wednesday 02 June 2010 22:41:42, Joel Brobecker wrote:
> > 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.
> 
> This looks fine, but I'm going to defer to Pedro or Stan, who know
> tracepoints better than I do.

Looks fine to me too.  Thanks.

-- 
Pedro Alves

Re: [RFA] gdb.trace, use gdb_test_no_output

[Michael Snyder]

Pedro Alves wrote:
> On Wednesday 02 June 2010 22:41:42, Joel Brobecker wrote:
>>> 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.
>> This looks fine, but I'm going to defer to Pedro or Stan, who know
>> tracepoints better than I do.
> 
> Looks fine to me too.  Thanks.
> 

Done.  Thanks for the review.