procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR libstdc++/89023 fix test that fails when <omp.h> not available

Browse source 
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
This commit is contained in:
Jonathan Wakely 2019-02-11 12:56:59 +00:00 • committed by Jonathan Wakely
parent e66084a445
commit 271ad97b6b
4 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -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

9
libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc → libstdc++-v3/testsuite/17_intro/headers/c++2011/parallel_mode.cc
View file

@ -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

25
libstdc++-v3/testsuite/17_intro/headers/c++2014/parallel_mode.cc Normal file
View file

@ -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

25
libstdc++-v3/testsuite/17_intro/headers/c++2017/parallel_mode.cc Normal file
View file

@ -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