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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ec595d8692baeed8b2e9f19a82ab163ba4148c82..a6736b3abab8578f94efcc83a814954cf8ead427 100644 (file)
--- 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 2e858e7886fd3bfd3620bb447199e4a775593231..8da12a064db5b7662f0cd130026d2684550ef8c7 100644 (file)
--- 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 fa589ea59a0741d0ad8a83f5024d28e0cb119a24..8275523d753bf81cb8b2eba327ac554e61ea8114 100644 (file)
--- 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 e2ba187be6002c98467208524ad7f85b20e3a4a7..e4ff66edd3d58494a18375d453886384b6ae6140 100644 (file)
--- 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 165912853cdd6e60203cbdcf296a356647b6754d..075f1cd4bba5e71648c1c4d0184d5c5df52d8d2a 100644 (file)
--- 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 61a87d8329a5d5a24c4c80b0c08f4e018aa08a63..63b6e2bd479e64402439b6fbb976b4d909f6dfb9 100644 (file)
--- 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 800d1aacc16daf65f3c4b6b61f658819fe78f234..1a4c4647c7ce3383cd023b78ff85588de6dd8707 100644 (file)
--- 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 fdfe39aa9d97d5d426ed04e35c82b8ff171ff84a..8728bafc7afd39d0b5df6478e8861d98ba1cf0b2 100644 (file)
--- 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 bb1e8019add7372fab99da78834d9fd35cc745d5..0505656189305f72877d2399db586a5f4a0aa7d7 100644 (file)
--- 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 0292d4aa9a22f3518d493f6833b1031cc6fe5f06..d93bd1633b84c331325b291d49a10f3c07bbe8c3 100644 (file)
--- 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 db288ce263ac07c28904778375571ce9c6dd71d8..b336ec100a0cfbc03b58298f75e60e4c5c301359 100644 (file)
--- 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 023997136bcf42bd7e72434cc3c3f4ae223dffbe..5c4c768a071599f65fea34069278e4692261e79f 100644 (file)
--- 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]