From 9dfc74a3ca1a13573044e8d2c3a7e7c1e623e72f Mon Sep 17 00:00:00 2001 From: Nathaniel Smith Date: Thu, 12 Feb 2004 17:47:47 +0000 Subject: * lib/scanasm.exp (dg-scan): Quote pattern before display. From-SVN: r77715 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/lib/scanasm.exp | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a0e5f70..c4cdf7e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-02-12 Nathaniel Smith + + * lib/scanasm.exp (dg-scan): Quote pattern before display. + 2004-02-12 Hartmut Penner * g++.dg/simd-2.C: xfail on ppc64-linux. diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index cf414fb..79d93cb 100644 --- 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" } } -- cgit v1.1