public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: William Schmidt <wschmidt@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/wschmidt/heads/builtins3)] libstdc++: Skip PSTL tests when installed TBB is too old [PR 96718]
Date: Fri, 28 Aug 2020 19:55:15 +0000 (GMT)	[thread overview]
Message-ID: <20200828195515.CD556384605A@sourceware.org> (raw)

https://gcc.gnu.org/g:988fb2f597d67cdf3603654372c020c28448441f

commit 988fb2f597d67cdf3603654372c020c28448441f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Aug 21 12:01:05 2020 +0100

    libstdc++: Skip PSTL tests when installed TBB is too old [PR 96718]
    
    These tests do not actually require TBB, because they only inspect the
    feature test macros present in the headers. However, if TBB is installed
    then its headers will be included, and the version will be checked. If
    the version is too old, compilation fails due to a #error directive.
    
    This change disables the tests if TBB is not present, so that we skip
    them instead of failing.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/96718
            * testsuite/25_algorithms/pstl/feature_test-2.cc: Require
            tbb-backend effective target.
            * testsuite/25_algorithms/pstl/feature_test-3.cc: Likewise.
            * testsuite/25_algorithms/pstl/feature_test-5.cc: Likewise.
            * testsuite/25_algorithms/pstl/feature_test.cc: Likewise.

Diff:
---
 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc | 1 +
 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc | 1 +
 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc | 1 +
 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc
index 3e74f89bc41..88c5ea5b1d1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do preprocess { target c++17 } }
+// { dg-require-effective-target tbb-backend }
 
 #include <numeric>
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc
index 7693fe03548..4d75a186211 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do preprocess { target c++17 } }
+// { dg-require-effective-target tbb-backend }
 
 #include <execution>
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc
index 2d991958e75..f6f910204fe 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do preprocess { target c++17 } }
+// { dg-require-effective-target tbb-backend }
 
 #include <memory>
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
index c3a9be5e45a..817bda3474e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do preprocess { target c++17 } }
+// { dg-require-effective-target tbb-backend }
 
 #include <algorithm>


                 reply	other threads:[~2020-08-28 19:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200828195515.CD556384605A@sourceware.org \
    --to=wschmidt@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).