diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2019-02-11 12:56:59 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-02-11 12:56:59 +0000 |
commit | 271ad97b6b353eaa40c1efd6fec3b402af137482 (patch) | |
tree | 6a3dc98b029cff7caa060cbfab1c3ccc558c7aa5 | |
parent | e66084a445ce22d382afa9fb67f1ed25bf20c298 (diff) | |
download | gcc-271ad97b6b353eaa40c1efd6fec3b402af137482.zip gcc-271ad97b6b353eaa40c1efd6fec3b402af137482.tar.gz gcc-271ad97b6b353eaa40c1efd6fec3b402af137482.tar.bz2 |
PR libstdc++/89023 fix test that fails when <omp.h> not available
Instead of a single test that only checks whether <regex> can be
included in Parallel Mode, add tests for each of C++11/C++14/C++17 that
check whether <bits/extc++.h> is compatible with _GLIBCXX_PARALLEL.
This increases the coverage to (almost) all headers.
If <omp.h> 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
-rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/17_intro/headers/c++2011/parallel_mode.cc (renamed from libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc) | 9 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc | 25 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc | 25 |
4 files changed, 64 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 972a098..d792ea6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-02-11 Jonathan Wakely <jwakely@redhat.com> + + 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 <jwakely@redhat.com> 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 index 7810c74e..c07e347 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 // <http://www.gnu.org/licenses/>. +// { dg-options "-std=gnu++11" } // { dg-do compile { target c++11 } } // { dg-require-normal-mode "" } -#define _GLIBCXX_PARALLEL -#include <regex> +#if __has_include(<omp.h>) +# define _GLIBCXX_PARALLEL 1 +# include <bits/extc++.h> +#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 0000000..a818454 --- /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 +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++14" } +// { dg-do compile { target c++14 } } +// { dg-require-normal-mode "" } + +#if __has_include(<omp.h>) +# define _GLIBCXX_PARALLEL 1 +# include <bits/extc++.h> +#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 0000000..e84f59e --- /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 +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } +// { dg-require-normal-mode "" } + +#if __has_include(<omp.h>) +# define _GLIBCXX_PARALLEL 1 +# include <bits/extc++.h> +#endif |