public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
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	[thread overview]
Message-ID: <20221018133328.7574-2-tdevries@suse.de> (raw)
In-Reply-To: <20221018133328.7574-1-tdevries@suse.de>

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


  reply	other threads:[~2022-10-18 13:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-18 13:33 [PATCH 0/4] [gdb/testsuite] Test-case fixes with local-remote-board Tom de Vries
2022-10-18 13:33 ` Tom de Vries [this message]
2022-10-18 13:33 ` [PATCH 2/4] [gdb/testsuite] Fix gdb.base/return-nodebug.exp with local-remote-host.exp Tom de Vries
2022-10-18 13:33 ` [PATCH 3/4] [gdb/testsuite] Fix gdb.server/no-thread-db.exp " Tom de Vries
2022-10-18 13:33 ` [PATCH 4/4] [gdb/testsuite] Handle header files " Tom de Vries
2022-10-18 13:36 ` [pushed 0/4] [gdb/testsuite] Test-case fixes with local-remote-board Tom de Vries

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221018133328.7574-2-tdevries@suse.de \
    --to=tdevries@suse.de \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).