From 061217e948098ec01ee6d88e0e93049e3802117d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 11 Apr 2011 17:50:39 +0000 Subject: [PATCH] moveable.cc: Actually run it in parallel-mode for check-parallel. 2011-04-11 Paolo Carlini * testsuite/25_algorithms/inplace_merge/moveable.cc: Actually run it in parallel-mode for check-parallel. * testsuite/25_algorithms/rotate/moveable.cc: Likewise. * testsuite/25_algorithms/stable_partition/moveable.cc: Likewise. * testsuite/25_algorithms/remove/moveable.cc: Likewise. * testsuite/25_algorithms/sort_heap/check_compare_by_value.cc: Likewise. * testsuite/25_algorithms/unique/moveable.cc: Likewise. * testsuite/25_algorithms/remove_if/moveable.cc: Likewise. * testsuite/25_algorithms/heap/moveable.cc: Likewise. * testsuite/25_algorithms/next_permutation/moveable.cc: Only skip the tests based on std::lexicographical_compare for check-parallel. * testsuite/25_algorithms/prev_permutation/moveable.cc: Likewise. From-SVN: r172269 --- libstdc++-v3/ChangeLog | 17 +++++++++++++++++ .../testsuite/25_algorithms/heap/moveable.cc | 6 +----- .../25_algorithms/inplace_merge/moveable.cc | 6 +----- .../25_algorithms/next_permutation/moveable.cc | 16 +++++++++++----- .../25_algorithms/prev_permutation/moveable.cc | 16 +++++++++++----- .../testsuite/25_algorithms/remove/moveable.cc | 6 +----- .../25_algorithms/remove_if/moveable.cc | 6 +----- .../testsuite/25_algorithms/rotate/moveable.cc | 8 +------- .../sort_heap/check_compare_by_value.cc | 4 ---- .../25_algorithms/stable_partition/moveable.cc | 6 +----- .../testsuite/25_algorithms/unique/moveable.cc | 6 +----- 11 files changed, 46 insertions(+), 51 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3c51ed3c38f..c4ed61f5376 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,20 @@ +2011-04-11 Paolo Carlini + + * testsuite/25_algorithms/inplace_merge/moveable.cc: Actually run + it in parallel-mode for check-parallel. + * testsuite/25_algorithms/rotate/moveable.cc: Likewise. + * testsuite/25_algorithms/stable_partition/moveable.cc: Likewise. + * testsuite/25_algorithms/remove/moveable.cc: Likewise. + * testsuite/25_algorithms/sort_heap/check_compare_by_value.cc: + Likewise. + * testsuite/25_algorithms/unique/moveable.cc: Likewise. + * testsuite/25_algorithms/remove_if/moveable.cc: Likewise. + * testsuite/25_algorithms/heap/moveable.cc: Likewise. + + * testsuite/25_algorithms/next_permutation/moveable.cc: Only skip + the tests based on std::lexicographical_compare for check-parallel. + * testsuite/25_algorithms/prev_permutation/moveable.cc: Likewise. + 2011-04-10 Jonathan Wakely PR libstdc++/48541 diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc index 632d13ef5ab..1506b5f72f7 100644 --- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,10 +24,6 @@ #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 f7a35ffec2c..00ae7f21d48 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, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 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,10 +19,6 @@ // 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 a227e137761..1994ddc6ec4 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, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 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,10 +19,6 @@ // 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 @@ -82,8 +78,13 @@ test4() std::copy(array, array + 6, temp_array); Container con(temp_array, temp_array + 6); VERIFY( next_permutation(array, array + 6) ); + +// XXX FIXME: parallel-mode should deal correctly with moveable-only types +// per C++0x, at minimum smoothly fall back to serial. +#ifndef _GLIBCXX_PARALLEL VERIFY( std::lexicographical_compare(temp_array, temp_array + 6, array, array + 6) ); +#endif } VERIFY( !next_permutation(array,array + 6) ); for(int i = 0; i < 6; ++i) @@ -106,8 +107,13 @@ test5() std::copy(array, array + 6, temp_array); Container con(temp_array, temp_array + 6); VERIFY( next_permutation(array, array + 6, are_ordered) ); + +// XXX FIXME: parallel-mode should deal correctly with moveable-only types +// per C++0x, at minimum smoothly fall back to serial. +#ifndef _GLIBCXX_PARALLEL VERIFY( std::lexicographical_compare(temp_array, temp_array + 6, array, array + 6, are_ordered) ); +#endif } VERIFY( !next_permutation(array,array + 6, are_ordered) ); for(int i = 0; i < 6; ++i) diff --git a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc index 5570239b01f..fe3ea2c33a9 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, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 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,10 +19,6 @@ // 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 @@ -82,8 +78,13 @@ test4() std::copy(array, array + 6, temp_array); Container con(temp_array, temp_array + 6); VERIFY( prev_permutation(array, array + 6) ); + +// XXX FIXME: parallel-mode should deal correctly with moveable-only types +// per C++0x, at minimum smoothly fall back to serial. +#ifndef _GLIBCXX_PARALLEL VERIFY( !std::lexicographical_compare(temp_array, temp_array + 6, array, array + 6) ); +#endif } VERIFY( !prev_permutation(array,array + 6)) ; for(int i = 0; i < 6; ++i) @@ -106,8 +107,13 @@ test5() std::copy(array, array + 6, temp_array); Container con(temp_array, temp_array + 6); VERIFY( prev_permutation(array, array + 6, are_ordered) ); + +// XXX FIXME: parallel-mode should deal correctly with moveable-only types +// per C++0x, at minimum smoothly fall back to serial. +#ifndef _GLIBCXX_PARALLEL VERIFY( !std::lexicographical_compare(temp_array, temp_array + 6, array, array + 6, are_ordered) ); +#endif } VERIFY( !prev_permutation(array,array + 6, are_ordered) ); for(int i = 0; i < 6; ++i) diff --git a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc index 94ceded7418..42aa9971db4 100644 --- a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -22,10 +22,6 @@ #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 bb447d0559d..8b2026f7ea9 100644 --- a/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -22,10 +22,6 @@ #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 ac9e0b30909..6b6665ae490 100644 --- a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,10 +24,6 @@ #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 @@ -43,8 +39,6 @@ typedef test_container Fcontainer; typedef test_container Bcontainer; typedef test_container Rcontainer; - - void test1() { diff --git a/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc b/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc index 32cff8fd854..bb61cffbb23 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc @@ -19,10 +19,6 @@ #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 fe46463df4f..b649b10e3cd 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, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 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,10 +19,6 @@ // 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/unique/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc index fd6da1168e2..75e1eb52585 100644 --- a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -22,10 +22,6 @@ #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 -- 2.30.2