libstdc++: Remove dg-options "-std=gnu++2a" from XFAIL std::span tests

The testsuite will automatically select C++20 for these tests now, and
removing the hardcoded -std option allows them to be tested for C++23
and C++26 as well.

We can also combine the { dg-require-effective-target c++2a } directive
with the dg-do selector.

We need to add the no_pch options for tests that define
_GLIBCXX_ASSERTIONS in the test, otherwise the PCH is included without
that defined.

libstdc++-v3/ChangeLog:

	* testsuite/23_containers/span/back_assert_neg.cc: Remove
	dg-options and add effective target selector to dg-do. Add
	no_pch.
	* testsuite/23_containers/span/back_neg.cc: Likewise.
	* testsuite/23_containers/span/cons_1_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/cons_2_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/first_2_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/first_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/first_neg.cc: Likewise.
	* testsuite/23_containers/span/front_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/front_neg.cc: Likewise.
	* testsuite/23_containers/span/index_op_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/index_op_neg.cc: Likewise.
	* testsuite/23_containers/span/last_2_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/last_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/last_neg.cc: Likewise.
	* testsuite/23_containers/span/subspan_2_assert_neg.cc:
	Likewise.
	* testsuite/23_containers/span/subspan_3_assert_neg.cc:
	Likewise.
	* testsuite/23_containers/span/subspan_4_assert_neg.cc:
	Likewise.
	* testsuite/23_containers/span/subspan_5_assert_neg.cc:
	Likewise.
	* testsuite/23_containers/span/subspan_6_assert_neg.cc:
	Likewise.
	* testsuite/23_containers/span/subspan_assert_neg.cc: Likewise.
	* testsuite/23_containers/span/subspan_neg.cc: Likewise.
	* testsuite/24_iterators/range_operations/advance_debug_neg.cc:
	Likewise.
This commit is contained in:
Jonathan Wakely 2023-09-07 14:17:50 +01:00
parent 7810fb3a14
commit ed8fcd0df5
22 changed files with 38 additions and 60 deletions

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -1,6 +1,5 @@
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_DEBUG
#define _GLIBCXX_DEBUG

View file

@ -1,6 +1,5 @@
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_DEBUG
#define _GLIBCXX_DEBUG

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-do run { target c++20 xfail *-*-* } }
// { dg-add-options no_pch }
#undef _GLIBCXX_ASSERTIONS
#define _GLIBCXX_ASSERTIONS

View file

@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
// { dg-do compile { target c++20 } }
#include <span>

View file

@ -15,9 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++2a -D_GLIBCXX_ASSERTIONS" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
// { dg-options "-D_GLIBCXX_ASSERTIONS" }
// { dg-do run { target c++20 xfail *-*-* } }
#include <iterator>
#include <testsuite_iterators.h>