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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 4AC34397283B for ; Mon, 10 May 2021 15:28:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4AC34397283B Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-567-1JL8XU_qPx2uSnImPc68Eg-1; Mon, 10 May 2021 11:28:37 -0400 X-MC-Unique: 1JL8XU_qPx2uSnImPc68Eg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3CA4107ACFA; Mon, 10 May 2021 15:28:35 +0000 (UTC) Received: from localhost (unknown [10.33.36.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77FA060CC5; Mon, 10 May 2021 15:28:35 +0000 (UTC) Date: Mon, 10 May 2021 16:28:34 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 4/9] libstdc++: Remove redundant -std=gnu++17 options from concurrency tests Message-ID: <20210510152834.GK3008@redhat.com> References: MIME-Version: 1.0 In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="sC1KxrFoiW8MuHBc" Content-Disposition: inline X-Spam-Status: No, score=-15.1 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2021 15:28:41 -0000 --sC1KxrFoiW8MuHBc Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline GCC defaults to -std=gnu++17 now anyway, and using it explicitly in the dg-options directive prevents running these tests with different modes such as -std=c++17 or -std=gnu++20. Tested powerpc64le-linux. Committed to trunk. --sC1KxrFoiW8MuHBc Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 9cd88c022fcad783997cd4111b2e6c3700c4b15b Author: Jonathan Wakely Date: Mon May 10 16:22:53 2021 libstdc++: Remove redundant -std=gnu++17 option from concurrency tests GCC defaults to -std=gnu++17 now anyway, and using it explicitly in the dg-options directive prevents running these tests with different modes such as -std=c++17 or -std=gnu++20. libstdc++-v3/ChangeLog: * testsuite/29_atomics/atomic/69769.cc: Remove -std=gnu++17 from dg-options. * testsuite/29_atomics/atomic/is_always_lock_free.cc: * testsuite/29_atomics/atomic/requirements/typedefs.cc: * testsuite/29_atomics/atomic_integral/is_always_lock_free.cc: * testsuite/29_atomics/atomic_integral/requirements/typedefs.cc: * testsuite/30_threads/lock_guard/cons/deduction.cc: Likewise. * testsuite/30_threads/scoped_lock/cons/1.cc: Likewise. * testsuite/30_threads/scoped_lock/cons/deduction.cc: Likewise. * testsuite/30_threads/scoped_lock/requirements/explicit_instantiation.cc: Likewise. * testsuite/30_threads/scoped_lock/requirements/typedefs.cc: Likewise. * testsuite/30_threads/shared_lock/70766.cc: Likewise. * testsuite/30_threads/shared_mutex/cons/1.cc: Likewise. * testsuite/30_threads/shared_mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/shared_mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/shared_mutex/requirements/standard_layout.cc: Likewise. * testsuite/30_threads/shared_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/shared_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/shared_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/unique_lock/cons/deduction.cc: Likewise. diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/69769.cc b/libstdc++-v3/testsuite/29_atomics/atomic/69769.cc index 8258594e67c..d9d0821b8f2 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/69769.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/69769.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-atomic-builtins "" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/is_always_lock_free.cc b/libstdc++-v3/testsuite/29_atomics/atomic/is_always_lock_free.cc index 063076ad274..2fa3a40e98c 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/is_always_lock_free.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/is_always_lock_free.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/requirements/typedefs.cc b/libstdc++-v3/testsuite/29_atomics/atomic/requirements/typedefs.cc index 28adc675939..c730e1ab117 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/requirements/typedefs.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-atomic-builtins "" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/is_always_lock_free.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/is_always_lock_free.cc index 1d18c93092d..c866118943c 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/is_always_lock_free.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/is_always_lock_free.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/requirements/typedefs.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/requirements/typedefs.cc index da27c48e97d..981a85bb504 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/requirements/typedefs.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-atomic-builtins "" } diff --git a/libstdc++-v3/testsuite/30_threads/lock_guard/cons/deduction.cc b/libstdc++-v3/testsuite/30_threads/lock_guard/cons/deduction.cc index 9dfe6b97063..98091601d52 100644 --- a/libstdc++-v3/testsuite/30_threads/lock_guard/cons/deduction.cc +++ b/libstdc++-v3/testsuite/30_threads/lock_guard/cons/deduction.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/1.cc b/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/1.cc index 278fd8578e7..eef4a7faaaf 100644 --- a/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2017-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/deduction.cc b/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/deduction.cc index ca7dc2459c2..2b5ea203a0d 100644 --- a/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/deduction.cc +++ b/libstdc++-v3/testsuite/30_threads/scoped_lock/cons/deduction.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/explicit_instantiation.cc index 0e6e68087a6..6d6ccb04eff 100644 --- a/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/explicit_instantiation.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/typedefs.cc b/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/typedefs.cc index dd9626cf090..8cb02cfe54d 100644 --- a/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/typedefs.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/70766.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/70766.cc index c8e28dd36c9..6d5755bfd50 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/70766.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/70766.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc index 7c23b9c5f9b..b83de46fea8 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc index 6eb9a653193..667aec5ae56 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc index 4152981e5bb..67a6a5597db 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc index ffb8b044a74..733935442bc 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc index e5665ab0ce5..42063e7ca21 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc index 5e03cd144fe..9f68cec828a 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc index d9f2e5ec97d..0427f0f8a05 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/deduction.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/deduction.cc index b9e0fbceeb2..b676444c755 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/deduction.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/deduction.cc @@ -15,7 +15,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include --sC1KxrFoiW8MuHBc--