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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 66DAE3858C5F for ; Thu, 16 Feb 2023 12:40:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66DAE3858C5F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676551238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B1IWyrTKSATBm5jNdxdiGeErldv6+xpJ2Ltr6QynMwg=; b=YJQzRWzffpDNtH3fklIFLYYNamZPes97mgAO79Ak41nd1hHcTO7qVfE2JTnw0G5BPaw9xN arjr9T0XBQlb9L6ZHKo0hpMWg3R2UVs3Cj6p3mT45Vjmv9xmPqAnpQOUZbzPXcbZN2Iwrl s4qfz/ZNDGEqHnqvMxfONqhdvUs8kJU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-264-paeIWyP7M1ewXRM174g-xg-1; Thu, 16 Feb 2023 07:40:35 -0500 X-MC-Unique: paeIWyP7M1ewXRM174g-xg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D967C85A588; Thu, 16 Feb 2023 12:40:34 +0000 (UTC) Received: from localhost (unknown [10.33.37.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D12B2026D4B; Thu, 16 Feb 2023 12:40:34 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Thomas Rodgers Subject: [committed] libstdc++: Make names_pstl.cc require et tbb_backend Date: Thu, 16 Feb 2023 12:40:34 +0000 Message-Id: <20230216124034.124744-1-jwakely@redhat.com> In-Reply-To: <20230216114924.108222-1-jwakely@redhat.com> References: <20230216114924.108222-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Sigh ... this test still isn't right, because it fails on systems without a bug-fix for TBB 2020.3. We could just add -fpermissive to the test options, but let's just require tbb_backend (which isn't matched on systems with the buggy headers). Separately, I'm going to backport the TBB fix to Fedora 37 where I had the test FAIL. Tested x86_64-linux (Fedora 37 this time). Pushed to trunk. -- >8 -- The https://github.com/oneapi-src/oneTBB/pull/833 fix is needed for TBB headers to avoid an error with GCC 13. The new names_pstl.cc test needs to check effective target tbb_backend so that it's UNSUPPORTED on systems without fixed headers. libstdc++-v3/ChangeLog: * testsuite/17_intro/names_pstl.cc: Require et tbb_backend. --- libstdc++-v3/testsuite/17_intro/names_pstl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/17_intro/names_pstl.cc b/libstdc++-v3/testsuite/17_intro/names_pstl.cc index 42ce098550c..019e4774ff2 100644 --- a/libstdc++-v3/testsuite/17_intro/names_pstl.cc +++ b/libstdc++-v3/testsuite/17_intro/names_pstl.cc @@ -1,10 +1,12 @@ // { dg-do compile { target c++17 } } -// { dg-additional-options "-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" { target tbb_backend } } +// { dg-require-effective-target tbb_backend } +// { dg-add-options no_pch } // The TBB headers use non-reserved names (because they're not part of the // implementation) so we need to include them before the macro definitions // in names.cc: #if __has_include() +# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 # include #endif // Now we can define the macros to poison uses of non-reserved names: -- 2.39.1