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 775503857709 for ; Mon, 11 Sep 2023 16:35:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 775503857709 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=1694450145; 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=2pvvPLBHq5eOs/EWF5A6fPcR1nZ95fnMzSt4k2qiSX8=; b=Qn56RX9Kk8HiveyxhKA8HwSi95+SN5VeHiE/2/B8KL44Ymb0pKrmYtXdzKV19iGODEEEhl BCRei2lQzX0xqWIaU1DkM2duu+wudEeecIOH47by3id6vHrkSeO2HXroA/h6WP8bthq5pt S6ZMxEwt5+QvtLOZFMc332rbNp1Xtk8= 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-675-X5htujE8Oxu-hEUPrp1YTg-1; Mon, 11 Sep 2023 12:35:43 -0400 X-MC-Unique: X5htujE8Oxu-hEUPrp1YTg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 8E1B3928B87; Mon, 11 Sep 2023 16:35:43 +0000 (UTC) Received: from localhost (unknown [10.42.28.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 507AE40C2009; Mon, 11 Sep 2023 16:35:43 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 08/13] libstdc++: Remove dg-options "-std=gnu++20" from std::format tests Date: Mon, 11 Sep 2023 17:16:39 +0100 Message-ID: <20230911163534.1913512-9-jwakely@redhat.com> In-Reply-To: <20230911163534.1913512-1-jwakely@redhat.com> References: <20230911163534.1913512-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,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: 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/std/format/arguments/args.cc: Remove dg-options. * testsuite/std/format/arguments/lwg3810.cc: Likewise. Likewise. * testsuite/std/format/error.cc: Likewise. * testsuite/std/format/format_string.cc: Likewise. * testsuite/std/format/formatter/concept.cc: Likewise. * testsuite/std/format/formatter/ext_float.cc: Likewise. * testsuite/std/format/formatter/requirements.cc: Likewise. * testsuite/std/format/functions/107871.cc: Likewise. * testsuite/std/format/functions/format.cc: Likewise. * testsuite/std/format/functions/format_to.cc: Likewise. * testsuite/std/format/functions/format_to_n.cc: Likewise. * testsuite/std/format/functions/size.cc: Likewise. * testsuite/std/format/functions/vformat_to.cc: Likewise. * testsuite/std/format/parse_ctx.cc: Likewise. * testsuite/std/format/string.cc: Likewise. * testsuite/std/format/string_neg.cc: Likewise. * testsuite/std/format/functions/format_c++23.cc: Removed. --- libstdc++-v3/testsuite/std/format/arguments/args.cc | 1 - libstdc++-v3/testsuite/std/format/arguments/lwg3810.cc | 1 - libstdc++-v3/testsuite/std/format/error.cc | 1 - libstdc++-v3/testsuite/std/format/format_string.cc | 1 - libstdc++-v3/testsuite/std/format/formatter/concept.cc | 1 - libstdc++-v3/testsuite/std/format/formatter/ext_float.cc | 1 - libstdc++-v3/testsuite/std/format/formatter/requirements.cc | 1 - libstdc++-v3/testsuite/std/format/functions/107871.cc | 1 - libstdc++-v3/testsuite/std/format/functions/format.cc | 1 - libstdc++-v3/testsuite/std/format/functions/format_c++23.cc | 5 ----- libstdc++-v3/testsuite/std/format/functions/format_to.cc | 1 - libstdc++-v3/testsuite/std/format/functions/format_to_n.cc | 1 - libstdc++-v3/testsuite/std/format/functions/size.cc | 1 - libstdc++-v3/testsuite/std/format/functions/vformat_to.cc | 1 - libstdc++-v3/testsuite/std/format/parse_ctx.cc | 1 - libstdc++-v3/testsuite/std/format/string.cc | 1 - libstdc++-v3/testsuite/std/format/string_neg.cc | 1 - 17 files changed, 21 deletions(-) delete mode 100644 libstdc++-v3/testsuite/std/format/functions/format_c++23.cc diff --git a/libstdc++-v3/testsuite/std/format/arguments/args.cc b/libstdc++-v3/testsuite/std/format/arguments/args.cc index ae2eab6d560..a45f3fb24df 100644 --- a/libstdc++-v3/testsuite/std/format/arguments/args.cc +++ b/libstdc++-v3/testsuite/std/format/arguments/args.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/arguments/lwg3810.cc b/libstdc++-v3/testsuite/std/format/arguments/lwg3810.cc index 9ccb654de1b..f89f40203cb 100644 --- a/libstdc++-v3/testsuite/std/format/arguments/lwg3810.cc +++ b/libstdc++-v3/testsuite/std/format/arguments/lwg3810.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } // LWG 3810. CTAD for std::basic_format_args diff --git a/libstdc++-v3/testsuite/std/format/error.cc b/libstdc++-v3/testsuite/std/format/error.cc index a6918f5ab2e..878f60e0ec9 100644 --- a/libstdc++-v3/testsuite/std/format/error.cc +++ b/libstdc++-v3/testsuite/std/format/error.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/format_string.cc b/libstdc++-v3/testsuite/std/format/format_string.cc index 1dd6ca8f125..71c3d5d68f6 100644 --- a/libstdc++-v3/testsuite/std/format/format_string.cc +++ b/libstdc++-v3/testsuite/std/format/format_string.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/formatter/concept.cc b/libstdc++-v3/testsuite/std/format/formatter/concept.cc index fe56dc44a68..e28a8c20a87 100644 --- a/libstdc++-v3/testsuite/std/format/formatter/concept.cc +++ b/libstdc++-v3/testsuite/std/format/formatter/concept.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++23" } // { dg-do compile { target c++23 } } #include diff --git a/libstdc++-v3/testsuite/std/format/formatter/ext_float.cc b/libstdc++-v3/testsuite/std/format/formatter/ext_float.cc index 89810295b64..82e696fa797 100644 --- a/libstdc++-v3/testsuite/std/format/formatter/ext_float.cc +++ b/libstdc++-v3/testsuite/std/format/formatter/ext_float.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/formatter/requirements.cc b/libstdc++-v3/testsuite/std/format/formatter/requirements.cc index 7d95f7fafe9..bde67e586ef 100644 --- a/libstdc++-v3/testsuite/std/format/formatter/requirements.cc +++ b/libstdc++-v3/testsuite/std/format/formatter/requirements.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/functions/107871.cc b/libstdc++-v3/testsuite/std/format/functions/107871.cc index 1fb558e7ac6..f9125b930af 100644 --- a/libstdc++-v3/testsuite/std/format/functions/107871.cc +++ b/libstdc++-v3/testsuite/std/format/functions/107871.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc index 5141cbd11bf..dacc276e03c 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } // { dg-add-options no_pch } diff --git a/libstdc++-v3/testsuite/std/format/functions/format_c++23.cc b/libstdc++-v3/testsuite/std/format/functions/format_c++23.cc deleted file mode 100644 index 3caa70fcdf2..00000000000 --- a/libstdc++-v3/testsuite/std/format/functions/format_c++23.cc +++ /dev/null @@ -1,5 +0,0 @@ -// { dg-do run { target c++23 } } -// { dg-add-options no_pch } -// This test does not have -std=gnu++20 in dg-options so that format.cc -// can be tested for e.g. -std=c++26 -#include "format.cc" diff --git a/libstdc++-v3/testsuite/std/format/functions/format_to.cc b/libstdc++-v3/testsuite/std/format/functions/format_to.cc index c5c3c503625..94e6262bc66 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format_to.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format_to.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/functions/format_to_n.cc b/libstdc++-v3/testsuite/std/format/functions/format_to_n.cc index f7df3ed36dc..d6982222528 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format_to_n.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format_to_n.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/functions/size.cc b/libstdc++-v3/testsuite/std/format/functions/size.cc index 4509a7ccd73..1ece4108d85 100644 --- a/libstdc++-v3/testsuite/std/format/functions/size.cc +++ b/libstdc++-v3/testsuite/std/format/functions/size.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/functions/vformat_to.cc b/libstdc++-v3/testsuite/std/format/functions/vformat_to.cc index 6fa33b9fbac..fe0367f7496 100644 --- a/libstdc++-v3/testsuite/std/format/functions/vformat_to.cc +++ b/libstdc++-v3/testsuite/std/format/functions/vformat_to.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/parse_ctx.cc b/libstdc++-v3/testsuite/std/format/parse_ctx.cc index 260caf123d0..497427b54e5 100644 --- a/libstdc++-v3/testsuite/std/format/parse_ctx.cc +++ b/libstdc++-v3/testsuite/std/format/parse_ctx.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/string.cc b/libstdc++-v3/testsuite/std/format/string.cc index a472f8d588c..5d338644c62 100644 --- a/libstdc++-v3/testsuite/std/format/string.cc +++ b/libstdc++-v3/testsuite/std/format/string.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/std/format/string_neg.cc b/libstdc++-v3/testsuite/std/format/string_neg.cc index 8ec7096ffd3..7a60ef8cf0e 100644 --- a/libstdc++-v3/testsuite/std/format/string_neg.cc +++ b/libstdc++-v3/testsuite/std/format/string_neg.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include -- 2.41.0