From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31009 invoked by alias); 25 Oct 2013 20:21:19 -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 30952 invoked by uid 89); 25 Oct 2013 20:21:19 -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:18 +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 r9PKLHtF011752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 25 Oct 2013 16:21:17 -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 r9PKLAJb000870; Fri, 25 Oct 2013 16:21:16 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 12/17] fix up gdb.server Date: Fri, 25 Oct 2013 20:21:00 -0000 Message-Id: <1382732464-28121-13-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/msg00824.txt.bz2 This fixes gdb.server to be parallel-safe. ~ChangeLog~ 2013-10-24 Tom Tromey * gdb.server/file-transfer.exp: Use standard_output_file. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.server/file-transfer.exp | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb.server/file-transfer.exp index aa56380..841d757 100644 --- a/gdb/testsuite/gdb.server/file-transfer.exp +++ b/gdb/testsuite/gdb.server/file-transfer.exp @@ -35,15 +35,22 @@ gdb_test "disconnect" ".*" gdbserver_run "" proc test_file_transfer { filename description } { - gdb_test "remote put \"$filename\" down-server" \ + set up_server up-server + set down_server down-server + if {![is_remote host] && ![is_remote target]} { + set up_server [standard_output_file $up_server] + set down_server [standard_output_file $down_server] + } + + gdb_test "remote put \"$filename\" $down_server" \ "Successfully sent .*" "put $description" - gdb_test "remote get down-server up-server" \ + gdb_test "remote get $down_server $up_server" \ "Successfully fetched .*" "get $description" if { ![is_remote target] } { # If we can check the target copy of the file, do that too. # This should catch symmetric errors in upload and download. - set result [remote_exec host "cmp -s $filename down-server"] + set result [remote_exec host "cmp -s $filename $down_server"] if { [lindex $result 0] == 0 } { pass "compare intermediate $description" } else { @@ -51,25 +58,25 @@ proc test_file_transfer { filename description } { } } - set result [remote_exec host "cmp -s $filename up-server"] + set result [remote_exec host "cmp -s $filename $up_server"] if { [lindex $result 0] == 0 } { pass "compare $description" } else { fail "compare $description" } - gdb_test "remote delete down-server" \ + gdb_test "remote delete $down_server" \ "Successfully deleted .*" "deleted $description" if { ![is_remote target] } { - if { ! [remote_file target exists down-server] } { + if { ! [remote_file target exists $down_server] } { pass "verified deleted $description" } else { fail "verified deleted $description" } } - catch { file delete up-server } + catch { file delete $up_server } } test_file_transfer "$binfile" "binary file" -- 1.8.1.4