Re: [PATCH] Fix libstdc++ testsuite to handle VxWorks gthreads implementation

[Jonathan Wakely <jwakely@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1643 bytes --]

On 21/08/20 09:37 -0300, Alexandre Oliva wrote:
>On Dec 20, 2019, Jonathan Wakely <jwakely at redhat dot com> 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 <https://gcc.gnu.org/legacy-ml/gcc-patches/2019-12/msg00690.html>:
>
>- 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.



[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 987 bytes --]

commit ac4e9090fce653ba7a43ea5333efdd9bbe5c71a3
Author: Jonathan Wakely <jwakely@redhat.com>
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.