From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 83B653858C83; Tue, 18 Oct 2022 13:32:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83B653858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666099971; bh=FRCqRWST9UqW5xqNUl8kg8vt4gjd5aVrkQOdXm8x7LM=; h=From:To:Subject:Date:From; b=I4/N9mLtOvVotD/hnLWO0MuTvGz1e8xXLwcUAv/oWUBjmjtobsuz/U9sxloeWWWBH 6pjX2PEB4/jQuvLwvWYiQbUGW83rHBBhygSF+R0+rqnGWk3RjUIHJE3vME/VrpXUVU daBduawbG+qdgIUgbvJHxJuxBXJn15gs9zQo/RnE= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.server/file-transfer.exp with local-remote-host.exp X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 53273099b81ab4bd137efdb9f038e5bf4b5be9bc X-Git-Newrev: 473487c23ee1213bcba6fce37e8676eb39ab9180 Message-Id: <20221018133251.83B653858C83@sourceware.org> Date: Tue, 18 Oct 2022 13:32:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D473487c23ee1= 213bcba6fce37e8676eb39ab9180 commit 473487c23ee1213bcba6fce37e8676eb39ab9180 Author: Tom de Vries Date: Tue Oct 18 15:32:46 2022 +0200 [gdb/testsuite] Fix gdb.server/file-transfer.exp with local-remote-host= .exp =20 When running test-case gdb.server/file-transfer.exp with host board local-remote-host.exp, I get: ... Executing on host: cmp -s $outputs/gdb.server/file-transfer/file-transf= er \ down-server (timeout =3D 300) builtin_spawn [open ...]^M XYZ2ZYX FAIL: gdb.server/file-transfer.exp: compare intermediate binary file ... =20 The remote host and remote target cases are handled here together here = in proc test_file_transfer: ... if {![is_remote host] && ![is_remote target]} { set up_server [standard_output_file $up_server] set down_server [standard_output_file $down_server] } ... =20 Fix this by handling them separately. =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.server/file-transfer.exp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb= .server/file-transfer.exp index 80d61a0f506..310effd44b6 100644 --- a/gdb/testsuite/gdb.server/file-transfer.exp +++ b/gdb/testsuite/gdb.server/file-transfer.exp @@ -37,11 +37,15 @@ gdbserver_run "" proc test_file_transfer { filename description } { 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] + + if {![is_remote target]} { set down_server [standard_output_file $down_server] } =20 + if {![is_remote host]} { + set up_server [standard_output_file $up_server] + } + gdb_test "remote put \"$filename\" $down_server" \ "Successfully sent .*" "put $description" gdb_test "remote get $down_server $up_server" \