diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2023-09-15 14:27:56 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2023-09-16 00:10:46 +0100 |
commit | 8ccae1639fa66ac9566e337bb2fd0ee6366f3f7e (patch) | |
tree | a83b1432adba9c9ce8d848c5675e94f2ed580f87 | |
parent | 4be56e298fafff05e5bf2f097a3c9a5f75b509a6 (diff) | |
download | gcc-8ccae1639fa66ac9566e337bb2fd0ee6366f3f7e.zip gcc-8ccae1639fa66ac9566e337bb2fd0ee6366f3f7e.tar.gz gcc-8ccae1639fa66ac9566e337bb2fd0ee6366f3f7e.tar.bz2 |
libstdc++: Remove dg-options "-std=gnu++20" from remaining 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.
libstdc++-v3/ChangeLog:
* testsuite/18_support/coroutines/95917.cc: Remove dg-options
-std=gnu++2a.
* testsuite/18_support/coroutines/hash.cc: Likewise.
* testsuite/18_support/coroutines/lwg3460.cc: Likewise.
* testsuite/18_support/destroying_delete.cc: Likewise.
* testsuite/18_support/source_location/1.cc: Likewise.
* testsuite/18_support/source_location/consteval.cc: Likewise.
* testsuite/18_support/source_location/version.cc: Likewise.
* testsuite/19_diagnostics/error_category/operators/three_way.cc:
Likewise.
* testsuite/19_diagnostics/error_code/operators/three_way.cc:
Likewise.
* testsuite/19_diagnostics/error_condition/operators/three_way.cc:
Likewise.
* testsuite/19_diagnostics/stacktrace/output.cc: Likewise.
* testsuite/26_numerics/adjacent_difference/lwg2055.cc:
Likewise.
* testsuite/26_numerics/bit/bit.count/countl_zero.cc: Likewise.
* testsuite/26_numerics/bit/bit.count/countr_one.cc: Likewise.
* testsuite/26_numerics/bit/bit.count/countr_zero.cc: Likewise.
* testsuite/26_numerics/bit/bit.count/popcount.cc: Likewise.
* testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc: Likewise.
* testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc:
Likewise.
* testsuite/28_regex/iterators/regex_iterator/lwg3719.cc:
Likewise.
* testsuite/28_regex/iterators/regex_token_iterator/lwg3719.cc:
Likewise.
* testsuite/28_regex/sub_match/compare_c++20.cc: Likewise.
* testsuite/experimental/filesystem/iterators/106201.cc:
Likewise.
* testsuite/experimental/scopeguard/exit.cc: Likewise.
* testsuite/experimental/scopeguard/uniqueres.cc: Likewise.
24 files changed, 21 insertions, 43 deletions
diff --git a/libstdc++-v3/testsuite/18_support/coroutines/95917.cc b/libstdc++-v3/testsuite/18_support/coroutines/95917.cc index f6f85f4..8ee56ef 100644 --- a/libstdc++-v3/testsuite/18_support/coroutines/95917.cc +++ b/libstdc++-v3/testsuite/18_support/coroutines/95917.cc @@ -15,8 +15,8 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-std=gnu++2a -g0" } -// { dg-do compile { target c++2a } } +// { dg-options "-g0" } +// { dg-do compile { target c++20 } } // { dg-final { scan-assembler-not "dummy_resume_destroy" } } // { dg-final { scan-assembler-not "noop_coro" } } diff --git a/libstdc++-v3/testsuite/18_support/coroutines/hash.cc b/libstdc++-v3/testsuite/18_support/coroutines/hash.cc index 81b68f8..bddea03 100644 --- a/libstdc++-v3/testsuite/18_support/coroutines/hash.cc +++ b/libstdc++-v3/testsuite/18_support/coroutines/hash.cc @@ -1,5 +1,4 @@ -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include <coroutine> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc b/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc index 1d4b6d2..84f1ea2 100644 --- a/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc +++ b/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc @@ -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 <coroutine> diff --git a/libstdc++-v3/testsuite/18_support/destroying_delete.cc b/libstdc++-v3/testsuite/18_support/destroying_delete.cc index 4012ddd..2ee9272 100644 --- a/libstdc++-v3/testsuite/18_support/destroying_delete.cc +++ b/libstdc++-v3/testsuite/18_support/destroying_delete.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } #include <new> #include <type_traits> diff --git a/libstdc++-v3/testsuite/18_support/source_location/1.cc b/libstdc++-v3/testsuite/18_support/source_location/1.cc index 0898c9e..48707b3 100644 --- a/libstdc++-v3/testsuite/18_support/source_location/1.cc +++ b/libstdc++-v3/testsuite/18_support/source_location/1.cc @@ -18,8 +18,8 @@ // Example from C++ Standard Working Draft N4842, November 2019 Mailing // Adapted for testing. -// { dg-options "-std=gnu++2a -include string -include stdexcept" } -// { dg-do run { target c++2a } } +// { dg-options "-include string -include stdexcept" } +// { dg-do run { target c++20 } } #include <source_location> diff --git a/libstdc++-v3/testsuite/18_support/source_location/consteval.cc b/libstdc++-v3/testsuite/18_support/source_location/consteval.cc index 92b0313..802054d 100644 --- a/libstdc++-v3/testsuite/18_support/source_location/consteval.cc +++ b/libstdc++-v3/testsuite/18_support/source_location/consteval.cc @@ -18,8 +18,7 @@ // Example from C++ Standard Working Draft N4842, November 2019 Mailing // Adapted for testing. -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include <source_location> #include <string_view> @@ -119,7 +118,7 @@ int main () member_defaulted_sl.member.file_name()); constexpr std::string_view member_defaulted_sl_fn_name( member_defaulted_sl.member.function_name()); - static_assert(member_defaulted_sl.member.line() == 36); + static_assert(member_defaulted_sl.member.line() == 35); // closing paren of constructor declaration static_assert(member_defaulted_sl.member.column() == 25); static_assert(member_defaulted_sl_fn_name.ends_with("s::s(int)"sv)); diff --git a/libstdc++-v3/testsuite/18_support/source_location/version.cc b/libstdc++-v3/testsuite/18_support/source_location/version.cc index 540bb1a..8cb5902 100644 --- a/libstdc++-v3/testsuite/18_support/source_location/version.cc +++ b/libstdc++-v3/testsuite/18_support/source_location/version.cc @@ -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 preprocess { target c++2a } } +// { dg-do preprocess { target c++20 } } #include <version> diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/three_way.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/three_way.cc index 6f41ed2..0580017 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/three_way.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/three_way.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } #include <system_error> #include <testsuite_error.h> diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/three_way.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/three_way.cc index ce659d7..646f219 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/three_way.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/three_way.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } #include <system_error> #include <testsuite_error.h> diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/three_way.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/three_way.cc index 914fbf4..e568748 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/three_way.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/three_way.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } #include <system_error> #include <testsuite_error.h> diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc index 5116413..35389ec 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++23" } // { dg-do compile { target c++23 } } // { dg-require-effective-target stacktrace } diff --git a/libstdc++-v3/testsuite/26_numerics/adjacent_difference/lwg2055.cc b/libstdc++-v3/testsuite/26_numerics/adjacent_difference/lwg2055.cc index 870ddaf..4bd2c47 100644 --- a/libstdc++-v3/testsuite/26_numerics/adjacent_difference/lwg2055.cc +++ b/libstdc++-v3/testsuite/26_numerics/adjacent_difference/lwg2055.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } #include <numeric> #include <iterator> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_zero.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_zero.cc index 5cf208a..fb062c2 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_zero.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_zero.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_one.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_one.cc index 9e9bfcc..f63ec1e 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_one.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_one.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_zero.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_zero.cc index 044e1ea..f4de8f8 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_zero.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countr_zero.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/popcount.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/popcount.cc index f524e1f..53cb1da 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/popcount.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/popcount.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc index 25bddf5..7e5ce85 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc index 8064eda..74fc684 100644 --- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc +++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc @@ -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 <bit> #include <limits> diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/lwg3719.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/lwg3719.cc index e8c8f79..b110420 100644 --- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/lwg3719.cc +++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/lwg3719.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include <regex> diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/lwg3719.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/lwg3719.cc index 5c36ace..02019db 100644 --- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/lwg3719.cc +++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/lwg3719.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include <regex> diff --git a/libstdc++-v3/testsuite/28_regex/sub_match/compare_c++20.cc b/libstdc++-v3/testsuite/28_regex/sub_match/compare_c++20.cc index 0beaec0e..d60ab41 100644 --- a/libstdc++-v3/testsuite/28_regex/sub_match/compare_c++20.cc +++ b/libstdc++-v3/testsuite/28_regex/sub_match/compare_c++20.cc @@ -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 run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-timeout-factor 2 } #include <regex> diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc index 017b72e..425bd33 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } // { dg-require-filesystem-ts "" } diff --git a/libstdc++-v3/testsuite/experimental/scopeguard/exit.cc b/libstdc++-v3/testsuite/experimental/scopeguard/exit.cc index 60616d1..86e8821 100644 --- a/libstdc++-v3/testsuite/experimental/scopeguard/exit.cc +++ b/libstdc++-v3/testsuite/experimental/scopeguard/exit.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include <experimental/scope> diff --git a/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc b/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc index fe9d6ee..27a427f 100644 --- a/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc +++ b/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include <experimental/scope> |