From patchwork Wed Apr 1 21:44:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 1265364 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=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=JSRmBiyQ; 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 48t09C0jC3z9sPF for ; Thu, 2 Apr 2020 08:45:01 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E997E385DC07; Wed, 1 Apr 2020 21:44:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E997E385DC07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1585777499; bh=knSyVTwnetVIF0CPCNK4BsYKLdBQSfztgpXh2ohz+S8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=JSRmBiyQEv0DmCUoyim/TTUWoGB4vUZrPibWeldi7sUXHWd8Uh5Oi37CpG4M3LRlc 5jrAl/cgVTKLPXVRjo08N6bVZooAm794EU5a4cHz34VtRcsPPaM/OhIq5NLNUGf7NL 9E9KcjmkWLwAA4+x9qQG5Uor8UMi6zuJjhJ6nlJc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [IPv6:2001:67c:2050:1::465:204]) by sourceware.org (Postfix) with ESMTPS id 1C1BA385DC06 for ; Wed, 1 Apr 2020 21:44:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1C1BA385DC06 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 48t0924B58zQlHW; Wed, 1 Apr 2020 23:44:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id 4RLS1Ki_Y2Ac; Wed, 1 Apr 2020 23:44:50 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] d: Fix new tests gdc.dg/pr93038.d and gdc.dg/pr93038b.d in r10-7320 fail Date: Wed, 1 Apr 2020 23:44:42 +0200 Message-Id: <20200401214442.19831-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 595A11754 X-Rspamd-Score: -0.48 / 15.00 / 15.00 X-Spam-Status: No, score=-29.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, 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: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch adjusts another test in gdc.dg that was reported to be failing in PR94315. The scan-file match is likely too strict to always succeed, so instead have split it up into a set of smaller matches. Tested on x86_64-linux-gnu and committed to mainline. Regards Iain. --- gcc/testsuite/ChangeLog: PR d/94315 * gdc.dg/pr93038.d: Split dg-final into multiple tests. * gdc.dg/pr93038b.d: Likewise. --- gcc/testsuite/gdc.dg/pr93038.d | 4 +++- gcc/testsuite/gdc.dg/pr93038b.d | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gdc.dg/pr93038.d b/gcc/testsuite/gdc.dg/pr93038.d index 4e09690a473..79d30a85380 100644 --- a/gcc/testsuite/gdc.dg/pr93038.d +++ b/gcc/testsuite/gdc.dg/pr93038.d @@ -1,7 +1,9 @@ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93038 // { dg-options "-J $srcdir/gdc.dg/fileimports -MMD" } // { dg-do compile } -// { dg-final { scan-file pr93038.deps "pr93038.o: \[^\n\]*/pr93038.d \[ \\\\\n\]*\[^\n\]*/fileimports/pr93038.txt" } } +// { dg-final { scan-file pr93038.deps "(^|\\n)pr93038.o:" } } +// { dg-final { scan-file pr93038.deps "pr93038.d" } } +// { dg-final { scan-file pr93038.deps "pr93038.txt" } } // { dg-final { file delete pr93038.deps } } module pr93038; diff --git a/gcc/testsuite/gdc.dg/pr93038b.d b/gcc/testsuite/gdc.dg/pr93038b.d index 04177a7e01a..18649b8636a 100644 --- a/gcc/testsuite/gdc.dg/pr93038b.d +++ b/gcc/testsuite/gdc.dg/pr93038b.d @@ -1,7 +1,10 @@ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93038 // { dg-options "-J $srcdir/gdc.dg/fileimports -MMD -MP" } // { dg-do compile } -// { dg-final { scan-file pr93038b.deps "pr93038b.o: \[^\n\]*/pr93038b.d \[ \\\\\n\]*\[^\n\]*/fileimports/pr93038.txt\n\n\[^\n\]*/fileimports/pr93038.txt:" } } +// { dg-final { scan-file pr93038b.deps "(^|\\n)pr93038b.o:" } } +// { dg-final { scan-file pr93038b.deps "pr93038b.d" } } +// { dg-final { scan-file pr93038b.deps "pr93038.txt" } } +// { dg-final { scan-file pr93038b.deps "(^|\\n)\[^\n\]*pr93038.txt:" } } // { dg-final { file delete pr93038b.deps } } module pr93038b;