summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazu Hirata <kazu@codesourcery.com>2006-09-08 17:24:01 +0000
committerKazu Hirata <kazu@codesourcery.com>2006-09-08 17:24:01 +0000
commit85f012d792f178e1931023a8e0f90643aefd3812 (patch)
treed862949e36948d1dfbf2289a3c953bcce89f8f8f
parentc057c798668299cf9a0452bb4da8a70b517facfb (diff)
downloadbinutils-redhat-85f012d792f178e1931023a8e0f90643aefd3812.tar.gz
gas/testsuite/
Backport 2006-09-08 Kazu Hirata <kazu@codesourcery.com> * lib/gas-dg.exp (gas-dg-test): Treat $dir as a literal.
-rw-r--r--ChangeLog.csl8
-rw-r--r--gas/testsuite/lib/gas-dg.exp3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 6cfb514030..6d4c3ce5b2 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,11 @@
+2006-09-08 Kazu Hirata <kazu@codesourcery.com>
+
+ gas/testsuite/
+ Backport
+ 2006-09-08 Kazu Hirata <kazu@codesourcery.com>
+
+ * lib/gas-dg.exp (gas-dg-test): Treat $dir as a literal.
+
2006-09-07 Paul Brook <paul@codesourcery.com>
gas/
diff --git a/gas/testsuite/lib/gas-dg.exp b/gas/testsuite/lib/gas-dg.exp
index 92f7f3136c..801b9b4e93 100644
--- a/gas/testsuite/lib/gas-dg.exp
+++ b/gas/testsuite/lib/gas-dg.exp
@@ -36,7 +36,8 @@ proc gas-dg-test { prog do_what tool_flags } {
regsub -all "//" $dir "/" dir
regsub -all "//" $prog "/" prog
if [string match "$dir/*" $prog] {
- regsub "$dir" $prog "" prog
+ # We use (?q) to treat $dir as a literal.
+ regsub "(?q)$dir" $prog "" prog
}
# FIXME: This should be gas_start but it doesn't set comp_output.