From patchwork Fri Dec 18 21:06:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1418594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=adacore-com.20150623.gappssmtp.com header.i=@adacore-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=dQYXEOTj; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CyLys5czmz9sTc for ; Sat, 19 Dec 2020 08:07:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 11E4F393C84B; Fri, 18 Dec 2020 21:06:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id F1B5E393BC28 for ; Fri, 18 Dec 2020 21:06:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F1B5E393BC28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hainque@adacore.com Received: by mail-wr1-x42b.google.com with SMTP id r7so3722160wrc.5 for ; Fri, 18 Dec 2020 13:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore-com.20150623.gappssmtp.com; s=20150623; h=from:mime-version:subject:message-id:date:cc:to; bh=/mXu0U/cMIjTFN6ZbENwYnOEhxsSo3zUPhunUlqRAmo=; b=dQYXEOTjMp6yQm7O8kdcsihLZfHu36o2dJhtsu6I9OLKDgTdj+oooL3CG81JiaUWFI GMtzT3ijheMmWlT3iDl9zhUOMynq23hfa9rileGrvVDn7zx1I8HLWfDWdNFbZInar1du 9kynPu1VtXSBTrrb88VXOGbS/oxMN+xG8gXC1t5I3tgq/s4QP1Glj8Juq9eSN8yKQR1l /RcNWK7LO/UqXMHmrhwgZSVC57VpbGLkOvXx7T4dQCw2Mk8EKVqkAJ8Y7Mhh6hMIkQpQ ggqgJk3YVxotIdeANgrFGtuXT1uYE5g51VkdiKaGikHvhKUnCxjIUVqigoFSGXtLZnhX HI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:cc:to; bh=/mXu0U/cMIjTFN6ZbENwYnOEhxsSo3zUPhunUlqRAmo=; b=WoEjeGh80liemeSmIO308RtsO8GvMtmgr2x3cBn7XhY+1zdu4zkzB8ULovh3cXYdPT 7z9bvp8OcuurVDieSdnmsfs+u0gqc6G2Xp5I1rHhnYbbfyRCYFBBKUM1BWTPxyJxQLJ5 CPmFfrqgdHWf0JzcPfbPsjQYZBAfGxDY6to6dB+2QKWMoKDj5TsXhjzeWoDfMC/mQP+d ybZvlsFPz0HtiGte6/5eNkOz8nQY5tfh5gN6nt0rg6UCAIvOtpYsbkw8yBn30WghTpx1 0W9oqJM1j55S1mMgehiiAd0Rg5OyctEN7ksChG0spwFR8Xt5QztzoYJ28EgSo4seDRDg M4sQ== X-Gm-Message-State: AOAM532dlPx2DF1Cul6kpIUy8R2VwpvgUcOgX6sE1znlcpHIC/EVuXAt ezQEso15riIDlJV/8ICBpUjqFU6xGIpedFKkNjY= X-Google-Smtp-Source: ABdhPJzgBsOtO1q6WmbaLjKILoJp0pOlwqZwpEagVyyrKvD+dy9XI+chjh+p9/IpIYU5ZaINhxeQvw== X-Received: by 2002:adf:8184:: with SMTP id 4mr6537128wra.63.1608325587830; Fri, 18 Dec 2020 13:06:27 -0800 (PST) Received: from imac-2020.home (2a01cb0002912700c8e5df2fffee6db5.ipv6.abo.wanadoo.fr. [2a01:cb00:291:2700:c8e5:df2f:ffee:6db5]) by smtp.gmail.com with ESMTPSA id l1sm15812752wrq.64.2020.12.18.13.06.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Dec 2020 13:06:27 -0800 (PST) From: Olivier Hainque Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: [patch] libstdc++/testsuite: Tweak dg-prune-output regex for out-of-tree contexts Message-Id: <5A82B8CE-AF5B-462F-A70D-3AE7F535509B@adacore.com> Date: Fri, 18 Dec 2020 22:06:27 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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: , Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hello, This patch is a proposal to update the dg-prune-output regex in 20_util/bind/ref_neg.cc to account for possible extra subdirs of include/ before reaching "functional" in out-of-build-tree test runs (c++/10.2.1 in our case). I noticed only afterwards that many other tests seem to have adopted a simpler // { dg-prune-output "include" } Not entirely sure this would be appropriate here as well. This variant cures the failures we saw when running tests from our gcc-10 installed toolchain and I verified that the test still passes from a build tree on mainline, x86_64-linux host in both cases. Is this ok to commit ? Thanks in advance, Olivier 2020-12-18 Olivier Hainque libstdc++-v3/ * testsuite/20_util/bind/ref_neg.cc: Account for out-of-build-tree contexts in the dg-prune-output regexp. From 8ca4da2b492417752ab1fa7b86b75208ea17adc1 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Fri, 18 Dec 2020 18:09:21 +0000 Subject: [PATCH] Tweak dg-prune-output regex for out-of-tree contexts libstdc++-v3/ * testsuite/20_util/bind/ref_neg.cc: Tweak dg-prune-output regex for out-of-tree contexts. --- libstdc++-v3/testsuite/20_util/bind/ref_neg.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc index d77ad90cc253..bf9d3c0b3145 100644 --- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc +++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc @@ -49,7 +49,8 @@ void test02() } // Ignore the reasons for deduction/substitution failure in the headers. -// { dg-prune-output "/include/(functional|bits/invoke.h):" } +// Account for possible extra subdirs in out-of-tree test runs. +// { dg-prune-output "/include/(c../\[0-9.\]*/)?(functional|bits/invoke.h):" } int main() {