From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30833 invoked by alias); 25 Oct 2013 20:21:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 30684 invoked by uid 89); 25 Oct 2013 20:21:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Oct 2013 20:21:15 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9PKLE3J019044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 25 Oct 2013 16:21:14 -0400 Received: from barimba.redhat.com (ovpn-113-54.phx2.redhat.com [10.3.113.54]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9PKLAJW000870; Fri, 25 Oct 2013 16:21:13 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 07/17] fix up gdb.trace Date: Fri, 25 Oct 2013 20:21:00 -0000 Message-Id: <1382732464-28121-8-git-send-email-tromey@redhat.com> In-Reply-To: <1382732464-28121-1-git-send-email-tromey@redhat.com> References: <1382732464-28121-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-10/txt/msg00821.txt.bz2 This fixes gdb.trace to be parallel-safe. ~ChangeLog~ 2013-10-24 Tom Tromey * 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 \[ \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