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 6cfb5140306a88b46d3327375b4dfd54cfdadf14..6d4c3ce5b2ad0f4493a1017c9f28dbee29a945ea 100644 (file)
--- 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 92f7f3136c1783e243e5970a87ef666c9d33c3f2..801b9b4e93c140116010d0e3abf867b76fed3cc3 100644 (file)
--- 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.