mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
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.
This commit is contained in:
Tom Tromey
parent
847415068e
commit
32cfb09dfc
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
2013-11-04 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* gdb.mi/mi-cmd-param-changed.exp (test_command_param_changed):
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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'"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user