diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b7fc02a811e..3f7d3095801 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,27 @@ +2010-01-12 Paolo Carlini + + * 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 * 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 0e29acfcee2..7e27a320c47 100644 --- 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 // . +// NB: parallel-mode uses TR1 bits... +#undef _GLIBCXX_PARALLEL + #include #include #include @@ -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 0a696591682..632d13ef5ab 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc index 4b07a63edee..f7a35ffec2c 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc index d754f6b3c28..a227e137761 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc index 93a514fa8bc..481f52e528c 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc index fcad384dcdf..ca5bd7a103b 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc index 0d6d7d6b298..ab573201941 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc index 796c5df1b3c..5570239b01f 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc index 6a44bb8c8c4..cbf170be39f 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc index c06f3215b87..94ceded7418 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc index 5c961860b49..bb447d0559d 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc index 94e587ed2a1..ac9e0b30909 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc b/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc index 7ae2898de5f..4a506b5cfe6 100644 --- 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 #include +// 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 6972d16681d..a46411d5adb 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc index 193f1312849..fe46463df4f 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc index 09d6129c06c..4e4a6605f0b 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc index 86ff353967d..5ac80078bed 100644 --- 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 #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc index b5bf16dbb1f..fd6da1168e2 100644 --- 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 #include #include