aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHafiz Abid Qadeer <abidh@codesourcery.com>2013-05-03 15:43:58 +0000
committerHafiz Abid Qadeer <abidh@codesourcery.com>2013-05-03 15:43:58 +0000
commit1ebff1fdfdbf851157c55915a6a87ba3b3902823 (patch)
treec8b68e6833235d6242bb002d3b745c06023b75fc
parentcde7cb0129a884a060b99c7c83e8f5c9af728b0a (diff)
downloadgdb-1ebff1fdfdbf851157c55915a6a87ba3b3902823.zip
gdb-1ebff1fdfdbf851157c55915a6a87ba3b3902823.tar.gz
gdb-1ebff1fdfdbf851157c55915a6a87ba3b3902823.tar.bz2
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.
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/tracepoint.c2
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.trace/status-stop.exp10
4 files changed, 18 insertions, 3 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e34d03f..16a2e79 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 419765b..1ff6114 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 bfd7b68..ca1e0fb 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-03-27 Walfred Tedeschi <walfred.tedeschi@intel.com>
* gdb.xml/maint_print_struct.exp: New file.
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index bca03d2..10e2f4e 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -79,9 +79,13 @@ proc test_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
+ }
+ }
}
}