From: Kazu Hirata <kazu@codesourcery.com>
Date: Fri, 8 Sep 2006 17:24:01 +0000 (+0000)
Subject: 	gas/testsuite/
X-Git-Tag: binutils-csl-arm-2006q3-19~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d808b086d79b364f2167dd041dc65146eeaac5a;p=thirdparty%2Fbinutils-gdb.git

	gas/testsuite/
	Backport
	2006-09-08  Kazu Hirata  <kazu@codesourcery.com>

	* lib/gas-dg.exp (gas-dg-test): Treat $dir as a literal.
---

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 6cfb5140306..6d4c3ce5b2a 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 92f7f3136c1..801b9b4e93c 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.