using_namespace_std_tr1_neg.cc: Do not run in parallel-mode.

2010-01-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/17_intro/using_namespace_std_tr1_neg.cc: Do not run
	in parallel-mode.
	* testsuite/25_algorithms/inplace_merge/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/rotate/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/stable_partition/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/remove/moveable.c: Likewiwse.
	* testsuite/25_algorithms/random_shuffle/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/nth_element/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/partial_sort/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/next_permutation/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/partition/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/stable_sort/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/stable_sort/moveable2.cc: Likewiwse.
	* testsuite/25_algorithms/sort/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/prev_permutation/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/unique/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/remove_if/moveable.cc: Likewiwse.
	* testsuite/25_algorithms/heap/moveable.cc: Likewiwse.

	* testsuite/25_algorithms/search_n/iterator.cc: Reduce iteration #
	in parallel-mode.

From-SVN: r155841

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b7fc02a811ed4cf944c0806db97aab5eda68501d..3f7d3095801a7824367449f32ddda7439b79b36f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,27 @@
+2010-01-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * testsuite/17_intro/using_namespace_std_tr1_neg.cc: Do not run
+       in parallel-mode.
+       * testsuite/25_algorithms/inplace_merge/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/rotate/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/stable_partition/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/remove/moveable.c: Likewiwse.
+       * testsuite/25_algorithms/random_shuffle/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/nth_element/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/partial_sort/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/next_permutation/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/partition/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/stable_sort/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/stable_sort/moveable2.cc: Likewiwse.
+       * testsuite/25_algorithms/sort/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/prev_permutation/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/unique/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/remove_if/moveable.cc: Likewiwse.
+       * testsuite/25_algorithms/heap/moveable.cc: Likewiwse.
+
+       * testsuite/25_algorithms/search_n/iterator.cc: Reduce iteration #
+       in parallel-mode.
+
 2010-01-12  Hans-Peter Nilsson  <hp@axis.com>
 
        * testsuite/ext/profile/all.cc: Pass -D_GLIBCXX_PROFILE_NO_THREADS

diff --git a/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc b/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
index 0e29acfcee2739692a49297d23b61351982f091e..7e27a320c4745b25e92c61593f9140c6c2008508 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
+++ b/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
@@ -1,7 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do compile }
 
-// Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -18,6 +18,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// NB: parallel-mode uses TR1 bits...
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <array>
 #include <bitset>
@@ -63,4 +66,4 @@ namespace gnu
   using namespace std::tr1;  // { dg-error "is not a namespace-name" }
 }
 
-// { dg-error "expected namespace-name before" "" { target *-*-* } 63 } 
+// { dg-error "expected namespace-name before" "" { target *-*-* } 66 } 

diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
index 0a6965916828969cfa339707d972b9b73841feb3..632d13ef5abc6d63a52ee7ba5159092857b970f9 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -23,6 +24,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
index 4b07a63edee3482881a10d5258d8299726945063..f7a35ffec2cd624386184c029999eec034a164b4 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -19,6 +19,10 @@
 
 // 25.3.4 [lib.alg.merge]
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
index d754f6b3c287f03de263e1ede6d8a51cdb895e86..a227e137761da212837e0b6a8f2c95395ed5307c 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -19,6 +19,10 @@
 
 // 25.3.9 [lib.alg.permutation.generators]
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
index 93a514fa8bc2d4de22885b42cb745af3d3b1ff7a..481f52e528c44c8ad79b4c78afc8b10b7b6e5792 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
index fcad384dcdf0c83763ce4bab502518a4e06ca8f4..ca5bd7a103b1aed8d665969d73840afa58076b7b 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
index 0d6d7d6b298a791c82be49b8e0ec6f73ba447f3c..ab5732019419bacba4275400158f48994319678a 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <functional>
 #include <testsuite_hooks.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
index 796c5df1b3c797b2fd5312d6d0590c398f674e44..5570239b01f552e409708173a45a4add88c9bc14 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -19,6 +19,10 @@
 
 // 25.3.9 [lib.alg.permutation.generators]
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
index 6a44bb8c8c407a2a81586dd613fb3c67bb75e0f1..cbf170be39faaa86e42a924cf4bd947cd6ac4e7d 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -19,6 +19,10 @@
 
 // 25.2.11 random_shuffle()
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc
index c06f3215b87a1b533f98c17ce574d19c437b4afe..94ceded74188bc79ad31caa9fbf04df0b56653a4 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc
index 5c961860b4964424f2749ed2045bc8047c42536a..bb447d0559dfc556db1e018a2e4c550ed9b9c63a 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
index 94e587ed2a16df35753a8cc2180383a30f5bb8c3..ac9e0b3090972eca162b177cc13fd2e80983d287 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -23,6 +24,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc b/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc
index 7ae2898de5fabd8fe18600b7940b3f0a8b9ede25..4a506b5cfe6596396a7e8a7f5aa2b48dbf79e575 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -25,6 +25,11 @@
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>
 
+// XXX FIXME: why parallel-mode is so slow?
+#if !defined(TEST_DEPTH) && defined(_GLIBCXX_PARALLEL)
+#define TEST_DEPTH 10
+#endif
+
 #ifndef TEST_DEPTH
 #define TEST_DEPTH 14
 #endif

diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
index 6972d16681dfc0e7aa7038903c81784dce267a77..a46411d5adb4eb0ae8c5ac6e1b3644cabeeb3085 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
index 193f1312849b2e6332fa3aeb7474bf8f5413b114..fe46463df4fbad591074b6477642e95f61c00f26 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -19,6 +19,10 @@
 
 // 25.2.12 [lib.alg.partitions] Partitions.
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <functional>
 #include <testsuite_hooks.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
index 09d6129c06c773ec75c3255c457a0ec2df09b142..4e4a6605f0b5deac5a3b51445a561357c5b0dc2d 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +21,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
index 86ff353967d7bf00f2a941e279261fd0bed4fd07..5ac80078bedbda2dc1ba3e7c6d850bfef1140258 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +21,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
index b5bf16dbb1f31073565e700d727836a081f0485e..fd6da1168e2b6389ebf4c3219d47c1ba1aba5d0d 100644 (file)
--- a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
@@ -1,6 +1,7 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,10 @@
 
 #undef _GLIBCXX_CONCEPT_CHECKS
 
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
 #include <vector>
 #include <algorithm>
 #include <functional>