From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 13 Sep 2017 15:28:18 +0000 (+0100)
Subject: Fix libstdc++ tests using invalid effective-target
X-Git-Tag: releases/gcc-5.5.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0efb6a4bbc9dd3ec9b0eb4449710be193cf2e1e8;p=thirdparty%2Fgcc.git

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 42d7b31faa03..e4d83d26bc67 100644
--- 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 727a560cd17a..d46ffcd056b8 100644
--- 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 8eda714b61dc..3efb51ff1c26 100644
--- 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 7776c5fd5572..4c70e0d62416 100644
--- 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);
 }