* gdb.trace/collection.exp (run_trace_experiment): Make sure

	"tstart" is silent.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ee3f082..c0bd842 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-29  Pedro Alves  <pedro@codesourcery.com>
 
+       * gdb.trace/collection.exp (run_trace_experiment): Make sure
+       "tstart" is silent.
+
+2010-03-29  Pedro Alves  <pedro@codesourcery.com>
+
        * gdb.trace/collection.exp (executable): New.
        (binfile): Use it.
        (fpreg, spreg, pcreg): New.

diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index b05aa35..5d510ab 100644 (file)
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -93,13 +93,19 @@ proc prepare_for_trace_test {} {
 }
 
 proc run_trace_experiment { msg test_func } {
+    global gdb_prompt
+
     gdb_test "continue" \
        ".*Breakpoint \[0-9\]+, begin .*" \
        "collect $msg: advance to begin"
 
-    gdb_test "tstart" \
-           "\[\r\n\]+" \
-           "collect $msg: start trace experiment"
+    set test "collect $msg: start trace experiment"
+    gdb_test_multiple "tstart" "$test" {
+       -re "^tstart\r\n$gdb_prompt $" {
+           pass "$test"
+       }
+    }
+
     gdb_test "continue" \
            "Continuing.*Breakpoint \[0-9\]+, end.*" \
            "collect $msg: run trace experiment"