From 1dcaed0de0fd62cc5a87b7929d2572039612fe3f Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 3 Apr 2013 03:43:54 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.trace/tfile.c (write_basic_trace_file): Pass argument "tfile-basic.tf" instead of "basic.tf". (write_error_trace_file): Pass argument "tfile-error.tf" instead of "error.tf". * gdb.trace/tfile.exp: Update tfile names to "tfile-basic.tf" and "tfile-error.tf". --- gdb/testsuite/ChangeLog | 9 +++++++++ gdb/testsuite/gdb.trace/tfile.c | 4 ++-- gdb/testsuite/gdb.trace/tfile.exp | 24 +++++++++++++----------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 97285c7727e..24abf7b00b9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2013-04-03 Yao Qi + + * gdb.trace/tfile.c (write_basic_trace_file): Pass argument + "tfile-basic.tf" instead of "basic.tf". + (write_error_trace_file): Pass argument "tfile-error.tf" + instead of "error.tf". + * gdb.trace/tfile.exp: Update tfile names to + "tfile-basic.tf" and "tfile-error.tf". + 2013-04-02 Sandra Loosemore * gdb.cp/ovsrch.exp (test_class): Correct regexp to allow diff --git a/gdb/testsuite/gdb.trace/tfile.c b/gdb/testsuite/gdb.trace/tfile.c index 3ee3ac5594c..7020744ebd7 100644 --- a/gdb/testsuite/gdb.trace/tfile.c +++ b/gdb/testsuite/gdb.trace/tfile.c @@ -92,7 +92,7 @@ write_basic_trace_file (void) int fd, int_x; short short_x; - fd = start_trace_file ("basic.tf"); + fd = start_trace_file ("tfile-basic.tf"); /* The next part of the file consists of newline-separated lines defining status, tracepoints, etc. The section is terminated by @@ -177,7 +177,7 @@ write_error_trace_file (void) int len = sizeof (made_up) - 1; char *hex = alloca (len * 2 + 1); - fd = start_trace_file ("error.tf"); + fd = start_trace_file ("tfile-error.tf"); /* The next part of the file consists of newline-separated lines defining status, tracepoints, etc. The section is terminated by diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index f259952640e..087d207c053 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -33,21 +33,22 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ gdb_reinitialize_dir $srcdir/$subdir # Make sure we are starting fresh. -remote_file host delete basic.tf -remote_file host delete error.tf -remote_file target delete basic.tf -remote_file target delete error.tf +remote_file host delete tfile-basic.tf +remote_file host delete tfile-error.tf +remote_file target delete tfile-basic.tf +remote_file target delete tfile-error.tf remote_exec target "$binfile" # Copy tracefile from target to host through build. -remote_download host [remote_upload target basic.tf] basic.tf -remote_download host [remote_upload target error.tf] error.tf +remote_download host [remote_upload target tfile-basic.tf] tfile-basic.tf +remote_download host [remote_upload target tfile-error.tf] tfile-error.tf gdb_load $binfile # Program has presumably exited, now target a trace file it created. -gdb_test "target tfile basic.tf" "Created tracepoint.*" "target tfile" +gdb_test "target tfile tfile-basic.tf" "Created tracepoint.*" \ + "target tfile" gdb_test "info trace" ".*tracepoint.*in write_basic_trace_file.*" \ "info tracepoints on trace file" @@ -107,7 +108,8 @@ gdb_start gdb_load $binfile -gdb_test "target tfile error.tf" "Created tracepoint.*" "target tfile" +gdb_test "target tfile tfile-error.tf" "Created tracepoint.*" \ + "target tfile" gdb_test "tstatus" \ "Using a trace file.* @@ -119,14 +121,14 @@ Not looking at any trace frame.*" \ # Make sure we can reopen without error. gdb_test \ - "interpreter-exec mi \"-target-select tfile basic.tf\"" \ + "interpreter-exec mi \"-target-select tfile tfile-basic.tf\"" \ "\\^connected.*" gdb_test "interpreter-exec mi \"-trace-status\"" \ - "\\^done,supported=\"file\",trace-file=\".*basic.tf\",running=\"0\",stop-reason=\"request\",frames=\"${decimal}\",frames-created=\"${decimal}\",buffer-size=\"${decimal}\",buffer-free=\"${decimal}\",disconnected=\".*\",circular=\".*\",user-name=\"\",notes=\"\",start-time=\".*\",stop-time=\".*\"" \ + "\\^done,supported=\"file\",trace-file=\".*tfile-basic.tf\",running=\"0\",stop-reason=\"request\",frames=\"${decimal}\",frames-created=\"${decimal}\",buffer-size=\"${decimal}\",buffer-free=\"${decimal}\",disconnected=\".*\",circular=\".*\",user-name=\"\",notes=\"\",start-time=\".*\",stop-time=\".*\"" \ "-trace-status" # Test completion works well. -gdb_test "target tfile basic\t" "Assuming tracepoint.*" \ +gdb_test "target tfile tfile-basic\t" "Assuming tracepoint.*" \ "complete-command 'target tfile'" -- 2.30.2