From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [PATCH v3 07/17] fix up gdb.trace
Date: Fri, 25 Oct 2013 20:21:00 -0000 [thread overview]
Message-ID: <1382732464-28121-8-git-send-email-tromey@redhat.com> (raw)
In-Reply-To: <1382732464-28121-1-git-send-email-tromey@redhat.com>
This fixes gdb.trace to be parallel-safe.
~ChangeLog~
2013-10-24 Tom Tromey <tromey@redhat.com>
* gdb.trace/mi-traceframe-changed.exp: Pass -DTFILE_DIR
to compilation. Use standard_output_file.
(test_tfind_tfile): Update.
* gdb.trace/tfile.c (write_basic_trace_file)
(write_error_trace_file): Use TFILE_DIR.
* gdb.trace/tfile.exp: Pass -DTFILE_DIR to compilation. Use
standard_output_file.
---
gdb/testsuite/ChangeLog | 10 +++++
gdb/testsuite/gdb.trace/mi-traceframe-changed.exp | 31 ++++++++++----
gdb/testsuite/gdb.trace/tfile.c | 4 +-
gdb/testsuite/gdb.trace/tfile.exp | 51 ++++++++++++++++-------
4 files changed, 71 insertions(+), 25 deletions(-)
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index 21e11d5..d8b6f43 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -20,32 +20,49 @@ set MIFLAGS "-i=mi"
standard_testfile tfile.c
set executable $testfile
+if {![is_remote host] && ![is_remote target]} {
+ set tfile_basic [standard_output_file tfile-basic.tf]
+ set tfile_dir [file dirname $tfile_basic]/
+ set purely_local 1
+} else {
+ set tfile_basic tfile-basic.tf
+ set tfile_dir ""
+ set purely_local 0
+}
+
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
- executable {debug nowarnings}] != "" } {
+ executable \
+ [list debug nowarnings \
+ "additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \
+ != "" } {
untested ${testfile}.exp
return -1
}
# Make sure we are starting fresh.
-remote_file host delete tfile-basic.tf
-remote_file target delete tfile-basic.tf
+remote_file host delete $tfile_basic
+remote_file target delete $tfile_basic
remote_exec target "$binfile"
-# Copy tracefile from target to host.
-remote_download host [remote_upload target tfile-basic.tf] \
- tfile-basic.tf
+
+if {!$purely_local} {
+ # Copy tracefile from target to host.
+ remote_download host [remote_upload target tfile-basic.tf] \
+ tfile-basic.tf
+}
proc test_tfind_tfile { } {
with_test_prefix "tfile" {
global binfile
global decimal
+ global tfile_basic
if [mi_gdb_start] {
return
}
mi_gdb_load ${binfile}
- mi_gdb_test "-target-select tfile tfile-basic.tf" \
+ mi_gdb_test "-target-select tfile ${tfile_basic}" \
".*=breakpoint-created,bkpt=\{number=\"${decimal}\",type=\"tracepoint\",disp=\"keep\",enabled=\"y\",.*,func=\"write_basic_trace_file\".*\\^connected" \
"select trace file"
diff --git a/gdb/testsuite/gdb.trace/tfile.c b/gdb/testsuite/gdb.trace/tfile.c
index 7020744..3610086 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 ("tfile-basic.tf");
+ fd = start_trace_file (TFILE_DIR "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 ("tfile-error.tf");
+ fd = start_trace_file (TFILE_DIR "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 b4a7460..7b354ec 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -22,33 +22,50 @@
load_lib "trace-support.exp"
+if {![is_remote host] && ![is_remote target]} {
+ set tfile_basic [standard_output_file tfile-basic.tf]
+ set tfile_error [standard_output_file tfile-error.tf]
+ set tfile_dir [file dirname $tfile_basic]/
+ set purely_local 1
+} else {
+ set tfile_basic tfile-basic.tf
+ set tfile_error tfile-error.tf
+ set tfile_dir ""
+ set purely_local 0
+}
+
gdb_exit
gdb_start
standard_testfile
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
- executable {debug nowarnings}] != "" } {
+ executable \
+ [list debug nowarnings \
+ "additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \
+ != "" } {
untested ${testfile}.exp
return -1
}
gdb_reinitialize_dir $srcdir/$subdir
# Make sure we are starting fresh.
-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_file host delete $tfile_basic
+remote_file host delete $tfile_error
+remote_file target delete $tfile_basic
+remote_file target delete $tfile_error
remote_exec target "$binfile"
-# Copy tracefile from target to host through build.
-remote_download host [remote_upload target tfile-basic.tf] tfile-basic.tf
-remote_download host [remote_upload target tfile-error.tf] tfile-error.tf
+if {!$purely_local} {
+ # Copy tracefile from target to host through build.
+ 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 tfile-basic.tf" "Created tracepoint.*" \
- "target tfile"
+gdb_test "target tfile $tfile_basic" "Created tracepoint.*" \
+ "target tfile [file tail $tfile_basic]"
gdb_test "info trace" ".*tracepoint.*in write_basic_trace_file.*" \
"info tracepoints on trace file"
@@ -108,8 +125,8 @@ gdb_start
gdb_load $binfile
-gdb_test "target tfile tfile-error.tf" "Created tracepoint.*" \
- "target tfile"
+gdb_test "target tfile $tfile_error" "Created tracepoint.*" \
+ "target tfile [file tail $tfile_error]"
gdb_test "tstatus" \
"Using a trace file.*
@@ -124,14 +141,16 @@ gdb_test "info inferiors" "\\* 1 <null>\[ \t\]+${binfile}.*"
# Make sure we can reopen without error.
gdb_test \
- "interpreter-exec mi \"-target-select tfile tfile-basic.tf\"" \
- "\\^connected.*"
+ "interpreter-exec mi \"-target-select tfile $tfile_basic\"" \
+ "\\^connected.*" \
+ "interpreter-exec mi \"-target-select tfile tfile-basic.tf\""
gdb_test "interpreter-exec mi \"-trace-status\"" \
- "\\^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=\".*\"" \
+ "\\^done,supported=\"file\",trace-file=\".*$tfile_basic\",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 tfile-basic\t" "Assuming tracepoint.*" \
+gdb_test "target tfile [file rootname $tfile_basic]\t" \
+ "Assuming tracepoint.*" \
"complete-command 'target tfile'"
--
1.8.1.4
next prev parent reply other threads:[~2013-10-25 20:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-25 20:21 [PATCH v3 00/17] test suite parallel safety Tom Tromey
2013-10-25 20:21 ` [PATCH v3 12/17] fix up gdb.server Tom Tromey
2013-10-25 20:21 ` [PATCH v3 13/17] make gdb.asm parallel-safe Tom Tromey
2013-10-25 20:21 ` [PATCH v3 14/17] fix argv0-symlink.exp for parallel mode Tom Tromey
2013-10-25 20:21 ` [PATCH v3 03/17] fix weird.exp for parallel testing Tom Tromey
2013-10-25 20:21 ` [PATCH v3 02/17] fix some simple thinkos in the test suite Tom Tromey
2013-10-25 20:21 ` [PATCH v3 04/17] fix up gdb.gdb Tom Tromey
2013-10-25 20:21 ` [PATCH v3 05/17] fix up gdb.xml Tom Tromey
2013-10-28 11:23 ` Pedro Alves
2013-10-28 14:30 ` Tom Tromey
2013-10-25 20:21 ` Tom Tromey [this message]
2013-10-25 20:21 ` [PATCH v3 01/17] fix up log-file toggling Tom Tromey
2013-10-25 20:21 ` [PATCH v3 08/17] simple changes in gdb.base Tom Tromey
2013-10-25 20:21 ` [PATCH v3 17/17] switch to fully parallel mode Tom Tromey
2013-10-25 20:24 ` [PATCH v3 09/17] update checkpoint test Tom Tromey
2013-10-25 20:36 ` [PATCH v3 06/17] fix up gdb.mi Tom Tromey
2013-10-25 20:36 ` [PATCH v3 11/17] introduce relative_filename and use it Tom Tromey
2013-10-25 20:44 ` [PATCH v3 15/17] fix some "exec" tests Tom Tromey
2013-10-25 21:11 ` [PATCH v3 16/17] fix some fission tests Tom Tromey
2013-10-25 21:11 ` [PATCH v3 10/17] update fileio test Tom Tromey
2013-11-04 18:54 ` [PATCH v3 00/17] test suite parallel safety Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382732464-28121-8-git-send-email-tromey@redhat.com \
--to=tromey@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox