From: Hafiz Abid Qadeer <abidh@codesourcery.com>
Date: Fri, 3 May 2013 16:26:32 +0000 (+0000)
Subject: 2013-05-03  Hafiz Abid Qadeer  <abidh@codesourcery.com>
X-Git-Tag: gdb_7_6_1-2013-08-30-release~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=197a91019d71d6ddd332766a1bd013169c5cc3a9;p=thirdparty%2Fbinutils-gdb.git

2013-05-03  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* tracepoint.c (cmd_qtinit): Call 'stop_tracing'.

2013-05-03  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* status-stop.exp (test_tstart_tstart): Check for error
	returned by the second 'tstart' command.
---

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b93b087ce3e..3ca7f1ee8e2 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-03  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	* tracepoint.c (cmd_qtinit): Call 'stop_tracing'.
+
 2013-04-25  Hui Zhu  <hui@codesourcery.com>
 
 	PR gdb/15186
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index dcc2e78f707..f6fea3e7f46 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -2354,6 +2354,8 @@ cmd_qtinit (char *packet)
   /* Make sure we don't try to read from a trace frame.  */
   current_traceframe = -1;
 
+  stop_tracing ();
+
   trace_debug ("Initializing the trace");
 
   clear_installed_tracepoints ();
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d79e898cba..d0076154bdd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-03  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	* status-stop.exp (test_tstart_tstart): Check for error
+	returned by the second 'tstart' command.
+
 2013-04-25  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* gdb.arch/arm-bl-branch-dest.c: New file.
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 5ddcbabde05..899d466337c 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -75,7 +75,13 @@ proc test_tstart_tstart { } { with_test_prefix "tstart_tstart" {
     gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
     gdb_test_no_output "tstart"
 
-    gdb_test "tstart" "" "tstart again" "A trace is running already.  Start a new run\\? \\(y or n\\) " "y"
+    set test "tstart again"
+    gdb_test_multiple "tstart" $test {
+	-re "A trace is running already.  Start a new run.*y or n.*" {
+	    # Send 'y' and make sure that we don't get any error.
+	    gdb_test_no_output "y" $test
+	}
+    }
 }}
 
 # Verify that trace stops clearly when trace buffer is full.