gdb/testsuite/

	PR testsuite/12649
	* gdb.trace/ftrace.exp (test_fast_tracepoints): Import gdb_prompt.
	Protect gdb_test_multiple by final $gdb_prompt match.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1a51587..1a02cf9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2011-12-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+       PR testsuite/12649
+       * gdb.trace/ftrace.exp (test_fast_tracepoints): Import gdb_prompt.
+       Protect gdb_test_multiple by final $gdb_prompt match.
+
+2011-12-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
        * gdb.cp/static-method.exp (have_gcc_45682_fixed, info addr A::func()):
        New variable, new test.
        (list static-method.cc:xxx::(anonymous namespace)::A::func)

diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index f45c6da..ab0e3bf 100644 (file)
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -76,6 +76,7 @@ proc run_trace_experiment {} {
 }
 
 proc test_fast_tracepoints {} {
+    global gdb_prompt
 
     set fourgood 0
 
@@ -111,10 +112,10 @@ proc test_fast_tracepoints {} {
            }
 
            gdb_test_multiple "ftrace four_byter" "set 4-byte fast tracepoint" {
-               -re "May not have a fast tracepoint at .*" {
+               -re "May not have a fast tracepoint at .*\r\n$gdb_prompt $" {
                    pass "4-byte fast tracepoint could not be set"
                }
-               -re "Fast tracepoint .*" {
+               -re "Fast tracepoint .*\r\n$gdb_prompt $" {
                    pass "4-byte fast tracepoint is set"
                    set fourgood 1
                }