From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id D82633857C43 for ; Mon, 24 Aug 2020 15:09:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D82633857C43 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-241-l3PEJBkRN7S2NPgB_dr34Q-1; Mon, 24 Aug 2020 11:09:42 -0400 X-MC-Unique: l3PEJBkRN7S2NPgB_dr34Q-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 4892110ABDBF; Mon, 24 Aug 2020 15:09:41 +0000 (UTC) Received: from localhost (unknown [10.33.36.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFA497E46E; Mon, 24 Aug 2020 15:09:40 +0000 (UTC) Date: Mon, 24 Aug 2020 16:09:39 +0100 From: Jonathan Wakely To: Alexandre Oliva Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org, Corentin Gay Subject: Re: [PATCH] Fix libstdc++ testsuite to handle VxWorks gthreads implementation Message-ID: <20200824150939.GA3400@redhat.com> References: <20191220103352.GD40198@redhat.com> 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.001 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="szlDyXxWT551m6yh" Content-Disposition: inline X-Spam-Status: No, score=-14.4 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, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham 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, 24 Aug 2020 15:09:56 -0000 --szlDyXxWT551m6yh Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline On 21/08/20 09:37 -0300, Alexandre Oliva wrote: >On Dec 20, 2019, Jonathan Wakely wrote: > >> On 10/12/19 15:58 +0100, Corentin Gay wrote: >>> This patch was tested on x86_64-linux and is part of our nightly testing >>> on all platforms, including VxWorks. > >> Was it tested on AIX? > >> I think dg-require-gthreads will prevent the tests running for the >> single-threaded multilib on AIX, so it will work OK. But there's a >> chance it will need fixing. Let's wait and see (I'm currently unable >> to build GCC on AIX). > >Sorry it took us so long to get back on this. I've just refreshed the >patch at : > >- resolving some trivial conflicts within 30_threads/shared_mutex, > >- updating some renamed test file names within 30_threads/this_thread, and > >- dropping the obviated change to 30_threads/this_thread/yield.cc > >and gave it a spin on gcc111 in the cfarm. > >There weren't any changes to the libstdc++ results, according to >test_summary, not even in the unsupported (or any other) test counts. > >> OK for trunk, thanks. > >Given the approval and the lack of significant changes, I'll put this in >unless there are objections in the next 48 hours. Thanks for the review! Thanks. There's a new FAIL due to a bad merge. That test needs to be restricted to C++11 and C++14, which I did recently on master. However, since the default became -std=gnu++17 that means it stopped running on master. Since your patch it runs again, but now fails. This fixes it to use an explicit -std=gnu++11 and not run for C++17. Pushed to master. --szlDyXxWT551m6yh Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit ac4e9090fce653ba7a43ea5333efdd9bbe5c71a3 Author: Jonathan Wakely Date: Mon Aug 24 16:06:25 2020 libstdc++: Fix 30_threads/packaged_task/cons/alloc.cc regression libstdc++-v3/ChangeLog: * testsuite/30_threads/packaged_task/cons/alloc.cc: Run for C++11 and skip for C++17 or later. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc index dbe477ad1bf..d45637d4f83 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc @@ -1,6 +1,6 @@ -// { dg-do run } +// { dg-options "-std=gnu++11" } +// { dg-do run { target { c++11_only || c++14_only } } } // { dg-additional-options "-pthread" { target pthread } } -// { dg-require-effective-target c++11 } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. --szlDyXxWT551m6yh--