* lib/scanasm.exp (dg-scan): Quote pattern before display.

From-SVN: r77715

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0e5f7023d661321ed844ae39301e3af4412e1b2..c4cdf7ec45c7aa4e301f3f7d1ae422e6fb0e2063 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-12  Nathaniel Smith <njs@codesourcery.com>
+
+       * lib/scanasm.exp (dg-scan): Quote pattern before display.
+
 2004-02-12  Hartmut Penner  <hpenner@de.ibm.com>
 
         * g++.dg/simd-2.C: xfail on ppc64-linux.

diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index cf414fb25cd8d4e7c9a11e89ac9378ed194718f9..79d93cbf089e9c7e0aad1c0089520a5f71f3eba1 100644 (file)
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -48,11 +48,14 @@ proc dg-scan { name positive testcase output_file orig_args } {
     set text [read $fd]
     close $fd
 
-    set match [regexp -- [lindex $orig_args 0] $text]
+    set pattern [lindex $orig_args 0]
+    set printable_pattern [string map {\t \\t \n \\n \r \\r \\ \\\\} $pattern]
+
+    set match [regexp -- $pattern $text]
     if { $match == $positive } {
-       pass "$testcase $name [lindex $orig_args 0]"
+       pass "$testcase $name $printable_pattern"
     } else {
-       fail "$testcase $name [lindex $orig_args 0]"
+       fail "$testcase $name $printable_pattern"
     }
 }