From 271ad97b6b353eaa40c1efd6fec3b402af137482 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 11 Feb 2019 12:56:59 +0000 Subject: [PATCH] PR libstdc++/89023 fix test that fails when not available Instead of a single test that only checks whether can be included in Parallel Mode, add tests for each of C++11/C++14/C++17 that check whether is compatible with _GLIBCXX_PARALLEL. This increases the coverage to (almost) all headers. If is not available then the tests will trivially pass, because we don't care about compatibility with _GLIBCXX_PARALLEL in that case. PR libstdc++/89023 * testsuite/17_intro/headers/c++2011/parallel_mode.cc: New test. * testsuite/17_intro/headers/c++2014/parallel_mode.cc: New test. * testsuite/17_intro/headers/c++2017/parallel_mode.cc: New test. * testsuite/28_regex/headers/regex/parallel_mode.cc: Remove. From-SVN: r268769 --- libstdc++-v3/ChangeLog | 8 ++++++ .../headers/c++2011}/parallel_mode.cc | 9 ++++--- .../17_intro/headers/c++2014/parallel_mode.cc | 25 +++++++++++++++++++ .../17_intro/headers/c++2017/parallel_mode.cc | 25 +++++++++++++++++++ 4 files changed, 64 insertions(+), 3 deletions(-) rename libstdc++-v3/testsuite/{28_regex/headers/regex => 17_intro/headers/c++2011}/parallel_mode.cc (81%) create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 972a098950b..d792ea6556b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-02-11 Jonathan Wakely + + PR libstdc++/89023 + * testsuite/17_intro/headers/c++2011/parallel_mode.cc: New test. + * testsuite/17_intro/headers/c++2014/parallel_mode.cc: New test. + * testsuite/17_intro/headers/c++2017/parallel_mode.cc: New test. + * testsuite/28_regex/headers/regex/parallel_mode.cc: Remove. + 2019-02-09 Jonathan Wakely PR libstdc++/71044 diff --git a/libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/parallel_mode.cc similarity index 81% rename from libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc rename to libstdc++-v3/testsuite/17_intro/headers/c++2011/parallel_mode.cc index 7810c74e09f..c07e3478a9c 100644 --- a/libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/parallel_mode.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2018-2019 Free Software Foundation, Inc. +// Copyright (C) 2019 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 @@ -15,8 +15,11 @@ // with this library; see the file COPYING3. If not see // . +// { dg-options "-std=gnu++11" } // { dg-do compile { target c++11 } } // { dg-require-normal-mode "" } -#define _GLIBCXX_PARALLEL -#include +#if __has_include() +# define _GLIBCXX_PARALLEL 1 +# include +#endif diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc new file mode 100644 index 00000000000..a8184540b7c --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc @@ -0,0 +1,25 @@ +// Copyright (C) 2019 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++14" } +// { dg-do compile { target c++14 } } +// { dg-require-normal-mode "" } + +#if __has_include() +# define _GLIBCXX_PARALLEL 1 +# include +#endif diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc new file mode 100644 index 00000000000..e84f59e5819 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc @@ -0,0 +1,25 @@ +// Copyright (C) 2019 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } +// { dg-require-normal-mode "" } + +#if __has_include() +# define _GLIBCXX_PARALLEL 1 +# include +#endif -- 2.30.2