public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] [gdb/testsuite] Add escape_for_host
@ 2023-03-17 12:29 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2023-03-17 12:29 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ff000c4dbb2b99531c8cda1e0e67e787ce8aef20
commit ff000c4dbb2b99531c8cda1e0e67e787ce8aef20
Author: Tom de Vries <tdevries@suse.de>
Date: Fri Mar 17 13:29:13 2023 +0100
[gdb/testsuite] Add escape_for_host
In gdb_compile we have:
...
lappend new_options "ldflags=-Wl,-rpath,\\\$ORIGIN"
...
and we could improve readability by using {} rather than "":
...
lappend new_options {ldflags=-Wl,-rpath,\$ORIGIN}
...
But rather than manually adding escapes in a string, add a new proc
escape_for_host that care of this for us, allowing us to write:
...
lappend new_options [escape_for_host {ldflags=-Wl,-rpath,$ORIGIN}]
...
Tested on x86_64-linux.
Diff:
---
gdb/testsuite/lib/gdb.exp | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 5f32181f60e..b45c73fcc1a 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4653,6 +4653,16 @@ proc gdb_can_simple_compile {name code {type object} {compile_flags ""}} {
global gdb_saved_set_unbuffered_mode_obj
set gdb_saved_set_unbuffered_mode_obj ""
+# Escape STR sufficiently for use on host commandline.
+
+proc escape_for_host { str } {
+ set map {
+ {$} {\$}
+ }
+
+ return [string map $map $str]
+}
+
# Compile source files specified by SOURCE into a binary of type TYPE at path
# DEST. gdb_compile is implemented using DejaGnu's target_compile, so the type
# parameter and most options are passed directly to it.
@@ -4926,7 +4936,7 @@ proc gdb_compile {source dest type options} {
if { $shlib_load } {
lappend new_options "libs=-ldl"
}
- lappend new_options "ldflags=-Wl,-rpath,\\\$ORIGIN"
+ lappend new_options [escape_for_host {ldflags=-Wl,-rpath,$ORIGIN}]
}
}
set options $new_options
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-17 12:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-17 12:29 [binutils-gdb] [gdb/testsuite] Add escape_for_host Tom de Vries
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).