From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 4A9DF3858410; Fri, 17 Mar 2023 12:29:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A9DF3858410 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679056163; bh=UjLxN+bTu7Vn3Cu4YUmLa70b1jQ5wMdM7fyjagcY4YQ=; h=From:To:Subject:Date:From; b=E8Te/wJwv4cXiTNoas76k8kpcR8GXoKsK2qG8vK9/b/e3Q5GTJ0ZgQrlWe8Pb5fK+ Lm2sTAHZgkc8pAzq9rY5r30TJ3T77rRP1ppS3Xbqpx3dbiE07B9OP1tREU3WKwqbnX xj054HceuF7DlDchJ5sF8hJZ8hUP/Cz8ESYxHDXA= 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] Handle remote host in escape_for_host X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: ff000c4dbb2b99531c8cda1e0e67e787ce8aef20 X-Git-Newrev: a14e3d11b2656355ca2c3d5b5a9f05e46f71e897 Message-Id: <20230317122923.4A9DF3858410@sourceware.org> Date: Fri, 17 Mar 2023 12:29:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da14e3d11b265= 6355ca2c3d5b5a9f05e46f71e897 commit a14e3d11b2656355ca2c3d5b5a9f05e46f71e897 Author: Tom de Vries Date: Fri Mar 17 13:29:13 2023 +0100 [gdb/testsuite] Handle remote host in escape_for_host =20 With test-case gdb.arch/ftrace-insn-reloc.exp and host board local-remote-host-notty and target board native-gdbserver, I run into: ... FAIL: gdb.arch/ftrace-insn-reloc.exp: IPA loaded ... due to having: ... $ readelf -d ftrace-insn-reloc | grep RUNPATH 0x000000000000001d (RUNPATH) Library runpath: [] ... instead of: ... $ readelf -d ftrace-insn-reloc | grep RUNPATH 0x000000000000001d (RUNPATH) Library runpath: [$ORIGIN] ... =20 Handle this in escape_for_host. =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/lib/gdb.exp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b45c73fcc1a..8b1127ce0bc 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4656,8 +4656,14 @@ set gdb_saved_set_unbuffered_mode_obj "" # Escape STR sufficiently for use on host commandline. =20 proc escape_for_host { str } { - set map { - {$} {\$} + if { [is_remote host] } { + set map { + {$} {\\$} + } + } else { + set map { + {$} {\$} + } } =20 return [string map $map $str]