From 96cabfaa4327de5387487ab7af8239aebc00230e Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Tue, 21 Mar 2023 11:25:12 +0100
Subject: [PATCH] [gdb/testsuite] Fix gdb.xml/tdesc-regs.exp for remote host

Fix test-case gdb.xml/tdesc-regs.exp for remote host by using appropriate
filenames.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.xml/tdesc-regs.exp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index 4545cd1c9b5..684c47f0b35 100644
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -142,12 +142,10 @@ proc load_description { file errmsg xml_file } {
     close $ifd
     close $ofd
 
-    if {[is_remote host]} {
-	set regs_file [remote_download host "$regs_file" $xml_file]
-    }
+    set host_regs_file [gdb_remote_download host "$regs_file"]
 
     # Anchor the test output, so that error messages are detected.
-    set cmd "set tdesc filename [file tail $regs_file]"
+    set cmd "set tdesc filename $host_regs_file"
     set msg "set tdesc filename $xml_file - from $file"
     set cmd_regex [string_to_regexp $cmd]
     gdb_test_multiple $cmd $msg {
-- 
2.30.2