gdb/testsuite/

2013-03-13  Yao Qi  <yao@codesourcery.com>

	* gdb.trace/tsv.exp: Remove code unrelated to testing TSV.
	Replace some "gdb_test" with "gdb_test_no_output".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8488ca7f4718f5a45d2850182533ca67c26b21b1..588b0b39cb8fc6ee133c71a38bd5cb091069fc5a 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-13  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.trace/tsv.exp: Remove code unrelated to testing TSV.
+       Replace some "gdb_test" with "gdb_test_no_output".
+
 2013-03-12  Paul Hilfinger  <hilfingr@adacore.com>
 
         * gdb.ada/expr_delims.exp: New file.

diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 47d66ad0b2042c3feb6bca0a04fd87a67a02768d..bab0a107aa8c172cdbf3278a48415ec226d86f9e 100644 (file)
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -110,22 +110,10 @@ if { ![gdb_target_supports_trace] } then {
     return 1;
 }
 
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1 [expr $baseline + 7]
-
 gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test];
-set trcpt2 [gdb_gettpnum gdb_asm_test];
-set trcpt3 [gdb_gettpnum $testline1];
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
+
+if { $trcpt1 <= 0 } then {
     fail "setting tracepoints"
     return;
 }
@@ -138,7 +126,7 @@ gdb_trace_setactions "collect tsv for first tracepoint" \
        "$trcpt1" \
        "collect \$tvar5 += 1" "^$"
 
-gdb_test "tstart" ".*" ""
+gdb_test_no_output "tstart" ""
 
 gdb_test "print \$tvar5" " = 15" \
     "Print a trace state variable at start of run"
@@ -152,7 +140,7 @@ gdb_test "continue" \
 gdb_test "print \$tvar5" " = 16" \
     "Print a trace state variable during run"
 
-gdb_test "tstop" ".*" ""
+gdb_test_no_output "tstop" ""
 
 gdb_test "print \$tvar5" " = 16" \
     "Print a trace state variable after run"