From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8433A3857729; Wed, 7 Jun 2023 15:52:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8433A3857729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686153154; bh=ljuooShaSyQ3v7nsZyyDGX03zx2TsvKNDvo/BBpE6Dg=; h=From:To:Subject:Date:From; b=vRYn1cA/Jyd+ZCTs5Dr69UOPuU4vqtDi+UgrtNzxiohaR9zkfBobAF8henCRtToMf oquMliqexd6K2v/Y+Kzd12xU0dMGPXqER2OwOLgtyIvAWALAF4XbycFzMHS0/sYM2L ptTYm058IW4tKsGBwgZzxZmj6vaQvgTmbM0UIJLM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-1612] libstdc++: Fix some tests that fail with -fno-exceptions X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ae12aced97b41c7498ffc5b4dd314878289547ab X-Git-Newrev: fa8b4468e0d124bec0fdbfc0a168bd8c377b08ec Message-Id: <20230607155234.8433A3857729@sourceware.org> Date: Wed, 7 Jun 2023 15:52:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fa8b4468e0d124bec0fdbfc0a168bd8c377b08ec commit r14-1612-gfa8b4468e0d124bec0fdbfc0a168bd8c377b08ec Author: Jonathan Wakely Date: Wed Jun 7 13:01:36 2023 +0100 libstdc++: Fix some tests that fail with -fno-exceptions libstdc++-v3/ChangeLog: * testsuite/18_support/nested_exception/rethrow_if_nested-term.cc: Require effective target exceptions_enabled instead of using dg-skip-if. * testsuite/23_containers/vector/capacity/constexpr.cc: Expect shrink_to_fit() to be a no-op without exceptions enabled. * testsuite/23_containers/vector/capacity/shrink_to_fit.cc: Likewise. * testsuite/ext/bitmap_allocator/check_allocate_max_size.cc: Require effective target exceptions_enabled. * testsuite/ext/malloc_allocator/check_allocate_max_size.cc: Likewise. * testsuite/ext/mt_allocator/check_allocate_max_size.cc: Likewise. * testsuite/ext/new_allocator/check_allocate_max_size.cc: Likewise. * testsuite/ext/pool_allocator/check_allocate_max_size.cc: Likewise. * testsuite/ext/throw_allocator/check_allocate_max_size.cc: Likewise. Diff: --- .../18_support/nested_exception/rethrow_if_nested-term.cc | 2 +- libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc | 8 ++++++++ .../testsuite/23_containers/vector/capacity/shrink_to_fit.cc | 4 ++++ .../testsuite/ext/bitmap_allocator/check_allocate_max_size.cc | 2 ++ .../testsuite/ext/malloc_allocator/check_allocate_max_size.cc | 2 ++ .../testsuite/ext/mt_allocator/check_allocate_max_size.cc | 2 ++ .../testsuite/ext/new_allocator/check_allocate_max_size.cc | 2 ++ .../testsuite/ext/pool_allocator/check_allocate_max_size.cc | 2 ++ .../testsuite/ext/throw_allocator/check_allocate_max_size.cc | 1 + 9 files changed, 24 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested-term.cc b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested-term.cc index 5913392bd46..3bfc7ab9943 100644 --- a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested-term.cc +++ b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested-term.cc @@ -1,5 +1,5 @@ // { dg-do run { target c++11 } } -// { dg-skip-if "" { *-*-* } { "-fno-exceptions" } } +// { dg-require-effective-target exceptions_enabled } #include #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc index 92c23035e4f..f102e78425b 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc @@ -89,11 +89,19 @@ test_shrink_to_fit() std::vector v; v.reserve(9); v.shrink_to_fit(); +#if __cpp_exceptions VERIFY( v.capacity() == 0 ); +#else + VERIFY( v.capacity() == 9 ); +#endif v.reserve(9); v.resize(5); v.shrink_to_fit(); +#if __cpp_exceptions VERIFY( v.capacity() == v.size() ); +#else + VERIFY( v.capacity() == 9 ); +#endif return true; } diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc index a8cede2278d..6542b5fd39f 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc @@ -30,7 +30,11 @@ void test01() v.push_back(1); VERIFY( v.size() < v.capacity() ); v.shrink_to_fit(); +#if __cpp_exceptions VERIFY( v.size() == v.capacity() ); +#else + VERIFY( v.size() < v.capacity() ); +#endif } int main() diff --git a/libstdc++-v3/testsuite/ext/bitmap_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/bitmap_allocator/check_allocate_max_size.cc index 712489f26a9..e523bb8f6c2 100644 --- a/libstdc++-v3/testsuite/ext/bitmap_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/bitmap_allocator/check_allocate_max_size.cc @@ -16,6 +16,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-require-effective-target exceptions_enabled } + // 20.4.1.1 allocator members #include diff --git a/libstdc++-v3/testsuite/ext/malloc_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/malloc_allocator/check_allocate_max_size.cc index 53fb8d4ab31..e59f6ad99b9 100644 --- a/libstdc++-v3/testsuite/ext/malloc_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/malloc_allocator/check_allocate_max_size.cc @@ -16,6 +16,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-require-effective-target exceptions_enabled } + // 20.4.1.1 allocator members #include diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/mt_allocator/check_allocate_max_size.cc index cc6f94bb2d0..b636098b5c9 100644 --- a/libstdc++-v3/testsuite/ext/mt_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/mt_allocator/check_allocate_max_size.cc @@ -16,6 +16,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-require-effective-target exceptions_enabled } + // 20.4.1.1 allocator members #include diff --git a/libstdc++-v3/testsuite/ext/new_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/new_allocator/check_allocate_max_size.cc index 80eece038dc..dbe7307636c 100644 --- a/libstdc++-v3/testsuite/ext/new_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/new_allocator/check_allocate_max_size.cc @@ -16,6 +16,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-require-effective-target exceptions_enabled } + // 20.4.1.1 allocator members #include diff --git a/libstdc++-v3/testsuite/ext/pool_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/pool_allocator/check_allocate_max_size.cc index 7ad5f701521..6eecb74bcdf 100644 --- a/libstdc++-v3/testsuite/ext/pool_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/pool_allocator/check_allocate_max_size.cc @@ -16,6 +16,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-require-effective-target exceptions_enabled } + // 20.4.1.1 allocator members #include diff --git a/libstdc++-v3/testsuite/ext/throw_allocator/check_allocate_max_size.cc b/libstdc++-v3/testsuite/ext/throw_allocator/check_allocate_max_size.cc index 424d87b9df6..73fec6ff071 100644 --- a/libstdc++-v3/testsuite/ext/throw_allocator/check_allocate_max_size.cc +++ b/libstdc++-v3/testsuite/ext/throw_allocator/check_allocate_max_size.cc @@ -18,6 +18,7 @@ // { dg-require-time "" } // { dg-require-cstdint "" } +// { dg-require-effective-target exceptions_enabled } #include #include