Fix libstdc++ tests using invalid effective-target

	* testsuite/20_util/reference_wrapper/80504.cc: Do not use invalid
	effective-target.
	* testsuite/22_locale/conversions/buffer/2.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/basic/iter.cc: Likewise. Fix
	use of test_container.

From-SVN: r252093

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 42d7b31faa03c4e95bdfa093314f128d7a6e2435..e4d83d26bc677561beecbc38837da45aec6eeeff 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2017-09-13  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/20_util/reference_wrapper/80504.cc: Do not use invalid
+       effective-target.
+       * testsuite/22_locale/conversions/buffer/2.cc: Likewise.
+       * testsuite/28_regex/basic_regex/ctors/basic/iter.cc: Likewise. Fix
+       use of test_container.
+
        PR libstdc++/81468
        * include/std/chrono (time_point(const time_point<_Dur2>&)): Add
        missing constraint from LWG DR 1177.

diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc
index 727a560cd17af232e20cda274c02b6ee7181c0d9..d46ffcd056b82b97f8fa4b2fd57a5cf5ccdbf6dc 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc
@@ -15,7 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target c++11 } }
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
 
 #include <functional>
 

diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc
index 8eda714b61dc016559eb076c402cf9c96fb7ab0a..3efb51ff1c26a59eda6c8e0b8dd14d931967320c 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc
@@ -15,7 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do run { target c++11 } }
+// { dg-options "-std=gnu++11" }
+// { dg-do run }
 
 #include <locale>
 #include <sstream>

diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc
index 7776c5fd55723e7d99b144e16ea51426f36c6e41..4c70e0d62416b7d3baec46531ee7a13a7a45331c 100644 (file)
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc
@@ -15,7 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target c++11 } }
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
 
 #include <regex>
 #include <testsuite_iterators.h>
@@ -24,7 +25,8 @@ void
 test01()
 {
   char s[] = "";
-  __gnu_test::test_container<char, __gnu_test::forward_iterator_wrapper> c(s);
+  __gnu_test::test_container<char, __gnu_test::forward_iterator_wrapper>
+    c(s, s+1);
   std::regex r1(c.begin(), c.end());
   std::regex r2(c.begin(), c.end(), std::regex_constants::grep);
 }