From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 3856B3858C83 for ; Tue, 18 Oct 2022 13:33:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3856B3858C83 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 75BFC33E48 for ; Tue, 18 Oct 2022 13:33:29 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6265C139D2 for ; Tue, 18 Oct 2022 13:33:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +EjuFimrTmNPHwAAMHmgww (envelope-from ) for ; Tue, 18 Oct 2022 13:33:29 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/4] [gdb/testsuite] Fix gdb.server/file-transfer.exp with local-remote-host.exp Date: Tue, 18 Oct 2022 15:33:25 +0200 Message-Id: <20221018133328.7574-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018133328.7574-1-tdevries@suse.de> References: <20221018133328.7574-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2022 13:34:35 -0000 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-transfer \ down-server (timeout = 300) builtin_spawn [open ...]^M XYZ2ZYX FAIL: gdb.server/file-transfer.exp: compare intermediate binary file ... 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] } ... Fix this by handling them separately. Tested on x86_64-linux. --- 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] } + 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" \ -- 2.35.3