libstdc++.exp (libstdc++_init): Adjust regexp to work with previous versions of Tcl.

	* testsuite/lib/libstdc++.exp (libstdc++_init): Adjust regexp to
	work with previous versions of Tcl.

From-SVN: r211077

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b9520d3a4e62f5648df0ac0968f19057c96e630d..b90cc3b3c172cd59e9dafb6095bbe6bec0f877dd 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+       * testsuite/lib/libstdc++.exp (libstdc++_init): Adjust regexp to
+       work with previous versions of Tcl.
+
 2014-05-29  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/tr2/bool_set: Use UTF-8 for accented characters.

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 2b2a38be13a60686fdf6bf510d5e76834073940d..d91bed6471975574de5016ed6825efeecf2079fe 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -283,7 +283,7 @@ proc libstdc++_init { testfile } {
     append cxxflags " "
     append cxxflags [getenv CXXFLAGS]
 
-    if ![regexp "\-O" $cxxflags] {
+    if ![regexp ".*-O" $cxxflags] {
        append cxxflags " -g -O2"
     }