From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 5AB533858416; Fri, 3 Mar 2023 05:36:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AB533858416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677821787; bh=ycVnVZZ62f/6P/o6Uow8uI4o8joRSWwzSa/QqKsjW9Q=; h=From:To:Subject:Date:From; b=deslMIkA3aNFxsgUOKNng2MBPKuZE7irzhc1YJyrsLr7NABq5UFAbQpjEdGuzCQBu LQLQD/aK/hz1sVilKz+2JLOABX7dZ1ubR1q/BCA61zddxMXzEIJ6CLUufruOu1vG+l TT/tI9LHtK7gmrgdyFSS5IWthuGYTX4E2jyzcnac= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6437] [PR100127] Test for coroutine header in clang-compatible tests X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/master X-Git-Oldrev: ddf7411e2069c33f56541eab35c37558199f3c41 X-Git-Newrev: 1e4122f1159ace52c114c011013adce25172d77b Message-Id: <20230303053627.5AB533858416@sourceware.org> Date: Fri, 3 Mar 2023 05:36:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1e4122f1159ace52c114c011013adce25172d77b commit r13-6437-g1e4122f1159ace52c114c011013adce25172d77b Author: Alexandre Oliva Date: Fri Mar 3 01:47:00 2023 -0300 [PR100127] Test for coroutine header in clang-compatible tests The test is compatible with clang as well as gcc, but ISTM that testing for the __clang__ macro is just as potentially error-prone as macros that used to be GCC-specific are now defined in compilers that aim for GCC compatibility. Use a __has_include feature test instead. for gcc/testsuite/ChangeLog PR c++/100127 * g++.dg/coroutines/pr100127.C: Test for header rather than compiler macro. * g++.dg/coroutines/pr100772-a.C: Likewise. * g++.dg/coroutines/pr100772-b.C: Likewise. Diff: --- gcc/testsuite/g++.dg/coroutines/pr100127.C | 3 ++- gcc/testsuite/g++.dg/coroutines/pr100772-a.C | 3 ++- gcc/testsuite/g++.dg/coroutines/pr100772-b.C | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/g++.dg/coroutines/pr100127.C b/gcc/testsuite/g++.dg/coroutines/pr100127.C index 374cd710077..5879fd0bcc5 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100127.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100127.C @@ -1,4 +1,5 @@ -#ifdef __clang__ +#if !__has_include() \ + && __has_include() // for __clang__ #include namespace std { using namespace std::experimental; diff --git a/gcc/testsuite/g++.dg/coroutines/pr100772-a.C b/gcc/testsuite/g++.dg/coroutines/pr100772-a.C index a325d384fc3..06e705b0c65 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100772-a.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100772-a.C @@ -1,5 +1,6 @@ // { dg-additional-options "-fsyntax-only " } -#ifdef __clang__ +#if !__has_include() \ + && __has_include() // for __clang__ #include namespace std { using namespace std::experimental; diff --git a/gcc/testsuite/g++.dg/coroutines/pr100772-b.C b/gcc/testsuite/g++.dg/coroutines/pr100772-b.C index 6cdf8d1e529..4ef80a99594 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100772-b.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100772-b.C @@ -1,4 +1,5 @@ -#ifdef __clang__ +#if !__has_include() \ + && __has_include() // for __clang__ #include namespace std { using namespace std::experimental;