gdb/testsuite/

	* gdb.trace/tstatus.exp (run_trace_experiment): Save the output
	of 'tstatus' into tstatus_output.
	(top level): Save the trace data to tfile.  Read trace file in
	tfile target.  Check the trace status.

2 files changed, 40 insertions, 2 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 37eecbb..f4863a1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-14  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.trace/tstatus.exp (run_trace_experiment): Save the output
+	of 'tstatus' into tstatus_output.
+	(top level): Save the trace data to tfile.  Read trace file in
+	tfile target.  Check the trace status.
+
 2013-03-13  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.trace/tsv.exp (check_tsv): New.
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 743db91..74d0c27 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -34,9 +34,12 @@ if ![gdb_target_supports_trace] {
     return -1
 }
 
+set tstatus_output ""
+
 proc run_trace_experiment {} {
     global gdb_prompt
     global decimal
+    global tstatus_output
 
 #    gdb_test_no_output "set debug remote 1" ""
 
@@ -93,10 +96,12 @@ proc run_trace_experiment {} {
 
     set test "tstatus reports trace stop reason"
     gdb_test_multiple "tstatus" $test {
-	-re "Trace stopped by a tstop command \\(because I can\\)\..*Trace will stop if GDB disconnects\.\[\r\n\]+Trace user is me me me\.\[\r\n\]+Trace notes: different note\.\[\r\n\]+Not looking at any trace frame\..*\r\n$gdb_prompt $" {
+	-re "(Trace stopped by a tstop command \\(because I can\\)\..*Trace will stop if GDB disconnects\.\[\r\n\]+Trace user is me me me\.\[\r\n\]+Trace notes: different note\.\[\r\n\]+Not looking at any trace frame\.).*\r\n$gdb_prompt $" {
+	    set tstatus_output $expect_out(1,string)
 	    pass $test
 	}
-	-re "Trace stopped by a tstop command\..*\r\n$gdb_prompt $" {
+	-re "(Trace stopped by a tstop command\.).*\r\n$gdb_prompt $" {
+	    set tstatus_output $expect_out(1,string)
 	    unsupported $test
 	}
     }
@@ -131,3 +136,29 @@ proc test_tracepoints {} {
 }
 
 test_tracepoints
+
+set tracefile [standard_output_file ${testfile}]
+# Save trace frames to tfile.
+gdb_test "tsave ${tracefile}.tf" \
+    "Trace data saved to file '${tracefile}.tf'.*" \
+    "save tfile trace file"
+
+# Change target to tfile.
+set test "change to tfile target"
+gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
+    -re "A program is being debugged already.  Kill it. .y or n. " {
+	send_gdb "y\n"
+	exp_continue
+    }
+    -re "$gdb_prompt $" {
+	pass "$test"
+    }
+}
+
+# Convert "(because I can) to "\(because I can\)"
+set tstatus_output [string map {\( \\(} $tstatus_output]
+set tstatus_output [string map {\) \\)} $tstatus_output]
+
+# The status should be identical to the status of live inferior.
+gdb_test "tstatus" "Using a trace file\.\r\n${tstatus_output}.*" \
+    "tstatus on tfile target"