Use effective target instead of -std in dg-options

	* testsuite/20_util/hash/chi2_q_bit_flip_set.cc: Use effective target
	instead of -std in dg-options.
	* testsuite/20_util/hash/chi2_q_bit_string_set.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_uniform_random.cc: Likewise.
	* testsuite/20_util/hash/quality.cc: Likewise.
	* testsuite/25_algorithms/heap/moveable.cc: Likewise.
	* testsuite/25_algorithms/heap/moveable2.cc: Likewise.
	* testsuite/25_algorithms/nth_element/random_test.cc: Likewise.
	* testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
	* testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
	* testsuite/25_algorithms/sort/random_test.cc: Likewise.

From-SVN: r239547

12 files changed, 35 insertions, 24 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ec595d8..a6736b3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,18 @@
 2016-08-17  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/20_util/hash/chi2_q_bit_flip_set.cc: Use effective target
+	instead of -std in dg-options.
+	* testsuite/20_util/hash/chi2_q_bit_string_set.cc: Likewise.
+	* testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc: Likewise.
+	* testsuite/20_util/hash/chi2_q_uniform_random.cc: Likewise.
+	* testsuite/20_util/hash/quality.cc: Likewise.
+	* testsuite/25_algorithms/heap/moveable.cc: Likewise.
+	* testsuite/25_algorithms/heap/moveable2.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/random_test.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
+	* testsuite/25_algorithms/sort/random_test.cc: Likewise.
+
 	* testsuite/20_util/tuple/67844.cc: Require c++11 effective target.
 	* testsuite/20_util/tuple/cons/nested_tuple_construct.cc: Likewise.
 	* testsuite/27_io/rvalue_streams.cc: Likewise.
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
index 2e858e7..8da12a0 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
@@ -1,6 +1,6 @@
-// { dg-options "-std=gnu++11" }
 // Use smaller statistics when running on simulators, so it takes less time.
-// { dg-options "-std=gnu++11 -DSAMPLES=30000" { target simulator } }
+// { dg-options "-DSAMPLES=30000" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
index fa589ea..8275523 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
@@ -1,8 +1,8 @@
-// { dg-options "-std=gnu++11" }
 // Use smaller statistics when running on simulators, so it takes less time.
 // For e.g. cris-elf, mipsisa32r2el-elf, powerpc-eabi and i386-linux-gnu,
 // this test fails for SAMPLES=30000.
-// { dg-options "-std=gnu++11 -DSAMPLES=35000" { target simulator } }
+// { dg-options "-DSAMPLES=35000" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
index e2ba187..e4ff66e 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
@@ -1,7 +1,7 @@
-// { dg-options "-std=gnu++11" }
 // Use smaller statistics when running on simulators, so it takes less time.
 // For x86_64-linux-gnu SAMPLES=30000 fails, so increase slightly.
-// { dg-options "-std=gnu++11 -DSAMPLES=35000" { target simulator } }
+// { dg-options "-DSAMPLES=35000" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
index 1659128..075f1cd 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
@@ -1,7 +1,7 @@
-// { dg-options "-std=gnu++11" }
 // Use smaller statistics when running on simulators, so it takes less time.
 // For powerpc-eabi, SAMPLES=30000 fails.
-// { dg-options "-std=gnu++11 -DSAMPLES=35000" { target simulator } }
+// { dg-options "-DSAMPLES=35000" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/20_util/hash/quality.cc b/libstdc++-v3/testsuite/20_util/hash/quality.cc
index 61a87d8..63b6e2b 100644
--- a/libstdc++-v3/testsuite/20_util/hash/quality.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/quality.cc
@@ -1,5 +1,5 @@
-// { dg-options "-std=gnu++11" }
-// { dg-options "-DNTESTS=1 -DNSTRINGS=100 -DSTRSIZE=21 -std=gnu++11" { target simulator } }
+// { dg-options "-DNTESTS=1 -DNSTRINGS=100 -DSTRSIZE=21" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
index 800d1aa..1a4c464 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
@@ -1,5 +1,3 @@
-// { dg-options "-std=gnu++11" }
-
 // Copyright (C) 2005-2016 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -17,7 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11 -DITERATIONS=5" { target simulator } }
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // 25.3.6 Heap operations [lib.alg.heap.operations]
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
index fdfe39a..8728baf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
@@ -1,5 +1,3 @@
-// { dg-options "-std=gnu++11" }
-
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -17,7 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11 -DITERATIONS=5" { target simulator } }
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-do run { target c++11 } }
 
 // 25.3.6 Heap operations [lib.alg.heap.operations]
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
index bb1e801..0505656 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11" }
-// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-options "-DSIMULATOR_TEST" { target simulator } }
+// { dg-do run { target c++11 } }
 // { dg-require-cstdint "" }
 
 // 25.4.2 [lib.alg.nth.element]
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
index 0292d4a..d93bd16 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11" }
-// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-options "-DSIMULATOR_TEST" { target simulator } }
+// { dg-do run { target c++11 } }
 // { dg-require-cstdint "" }
 
 // 25.4.1.3 [lib.alg.partial.sort]
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
index db288ce..b336ec1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11" }
-// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-options "-DSIMULATOR_TEST" { target simulator } }
+// { dg-do run { target c++11 } }
 // { dg-require-cstdint "" }
 
 // 25.4.1.4 [lib.alg.partial.sort.copy]
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
index 0239971..5c4c768 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11" }
-// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-options "-DSIMULATOR_TEST" { target simulator } }
+// { dg-do run { target c++11 } }
 // { dg-require-cstdint "" }
 
 // 25.4.1 [lib.alg.sort]