diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-08-23 12:09:22 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-11-04 11:02:06 -0700 |
| commit | 32cfb09dfc283da30663f07b0e71726bcb3e093a (patch) | |
| tree | 832f480485c4bf7fe43efb06f9a69b068b2ab075 /gdb/testsuite/gdb.trace/mi-traceframe-changed.exp | |
| parent | 847415068e83cdeb6aeff56c31722f13584e74c1 (diff) | |
| download | gdb-32cfb09dfc283da30663f07b0e71726bcb3e093a.zip gdb-32cfb09dfc283da30663f07b0e71726bcb3e093a.tar.gz gdb-32cfb09dfc283da30663f07b0e71726bcb3e093a.tar.bz2 | |
fix up gdb.trace
This fixes gdb.trace to be parallel-safe.
2013-11-04 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.
Diffstat (limited to 'gdb/testsuite/gdb.trace/mi-traceframe-changed.exp')
| -rw-r--r-- | gdb/testsuite/gdb.trace/mi-traceframe-changed.exp | 31 |
1 files changed, 24 insertions, 7 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" |