From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id CAE09385CC90 for ; Fri, 15 Sep 2023 23:20:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAE09385CC90 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694820023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4R+gYMLlLlPw+DI5n7FrBJS8N2hh285af5mceF/NkHk=; b=Z2pj2rsTht+/Af5XHPz4FPD3A4NLiAG53zr/ry/DPC6I0RozjhdH6BA1+akn6sZNBGC+rG T36jb/Yw6cFyUrq+JzFui6Fz0YgjWHylGWJTjvsFb2U8cyJGqQE3aqh1eTVUVvjfC/1ZMQ wm/orOG4WnxTBNXOBCLfxYywAFm8xaY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-lDyp0wdGOraivqcg8pYfTA-1; Fri, 15 Sep 2023 19:20:21 -0400 X-MC-Unique: lDyp0wdGOraivqcg8pYfTA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61FEA101A529; Fri, 15 Sep 2023 23:20:21 +0000 (UTC) Received: from localhost (unknown [10.42.28.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 078B321B2413; Fri, 15 Sep 2023 23:20:20 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [committed 10/11] libstdc++: Remove dg-options "-std=gnu++20" from remaining tests Date: Sat, 16 Sep 2023 00:18:58 +0100 Message-ID: <20230915232009.2348586-10-jwakely@redhat.com> In-Reply-To: <20230915232009.2348586-1-jwakely@redhat.com> References: <20230915232009.2348586-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,URIBL_BLACK,URI_HEX autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested aarch64-linux. Pushed to trunk. -- >8 -- 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. --- libstdc++-v3/testsuite/18_support/coroutines/95917.cc | 4 ++-- libstdc++-v3/testsuite/18_support/coroutines/hash.cc | 3 +-- libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc | 3 +-- libstdc++-v3/testsuite/18_support/destroying_delete.cc | 3 +-- libstdc++-v3/testsuite/18_support/source_location/1.cc | 4 ++-- .../testsuite/18_support/source_location/consteval.cc | 5 ++--- libstdc++-v3/testsuite/18_support/source_location/version.cc | 3 +-- .../19_diagnostics/error_category/operators/three_way.cc | 3 +-- .../19_diagnostics/error_code/operators/three_way.cc | 3 +-- .../19_diagnostics/error_condition/operators/three_way.cc | 3 +-- libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc | 1 - .../testsuite/26_numerics/adjacent_difference/lwg2055.cc | 3 +-- .../testsuite/26_numerics/bit/bit.count/countl_zero.cc | 3 +-- .../testsuite/26_numerics/bit/bit.count/countr_one.cc | 3 +-- .../testsuite/26_numerics/bit/bit.count/countr_zero.cc | 3 +-- libstdc++-v3/testsuite/26_numerics/bit/bit.count/popcount.cc | 3 +-- .../testsuite/26_numerics/bit/bit.pow.two/bit_ceil.cc | 3 +-- .../testsuite/26_numerics/bit/bit.pow.two/has_single_bit.cc | 3 +-- .../testsuite/28_regex/iterators/regex_iterator/lwg3719.cc | 1 - .../28_regex/iterators/regex_token_iterator/lwg3719.cc | 1 - libstdc++-v3/testsuite/28_regex/sub_match/compare_c++20.cc | 3 +-- .../testsuite/experimental/filesystem/iterators/106201.cc | 1 - libstdc++-v3/testsuite/experimental/scopeguard/exit.cc | 1 - libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc | 1 - 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 f6f85f4df3f..8ee56ef3842 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 // . -// { 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 81b68f8246a..bddea03681e 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 #include diff --git a/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc b/libstdc++-v3/testsuite/18_support/coroutines/lwg3460.cc index 1d4b6d21e7e..84f1ea27139 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/18_support/destroying_delete.cc b/libstdc++-v3/testsuite/18_support/destroying_delete.cc index 4012ddde0b6..2ee927225a0 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/18_support/source_location/1.cc b/libstdc++-v3/testsuite/18_support/source_location/1.cc index 0898c9ea294..48707b3c3e7 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 diff --git a/libstdc++-v3/testsuite/18_support/source_location/consteval.cc b/libstdc++-v3/testsuite/18_support/source_location/consteval.cc index 92b0313593f..802054d1914 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 #include @@ -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 540bb1abff6..8cb59023e12 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do preprocess { target c++2a } } +// { dg-do preprocess { target c++20 } } #include 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 6f41ed21255..0580017ae0d 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include 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 ce659d7ab52..646f2196926 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include 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 914fbf4534f..e568748a63f 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc index 5116413344d..35389ecbd85 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 870ddaf5384..4bd2c47fc65 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include 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 5cf208a3cec..fb062c209ff 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 9e9bfcce331..f63ec1e23b1 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 044e1eab22e..f4de8f8c224 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 f524e1f59a2..53cb1da3016 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 25bddf578f1..7e5ce85b600 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 8064eda9133..74fc684c40b 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include 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 e8c8f79364a..b1104203b4e 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 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 5c36acead74..02019db71c3 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 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 0beaec0e1ef..d60ab41ca78 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 // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-timeout-factor 2 } #include diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc index 017b72ef5f6..425bd33eb46 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 60616d1a93f..86e8821f636 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 diff --git a/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc b/libstdc++-v3/testsuite/experimental/scopeguard/uniqueres.cc index fe9d6ee7cfc..27a427f7ea8 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 -- 2.41.0