public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Iain Buclaw <ibuclaw@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r10-7505] d: Fix new tests gdc.dg/pr93038.d and gdc.dg/pr93038b.d in r10-7320 fail
Date: Wed, 1 Apr 2020 21:43:00 +0000 (GMT) [thread overview]
Message-ID: <20200401214300.9B5E0385DC06@sourceware.org> (raw)
https://gcc.gnu.org/g:918b89b7623b6c42b09f37b7e3ef807d1abbabb8
commit r10-7505-g918b89b7623b6c42b09f37b7e3ef807d1abbabb8
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed Apr 1 23:37:06 2020 +0200
d: Fix new tests gdc.dg/pr93038.d and gdc.dg/pr93038b.d in r10-7320 fail
The scan-file match is likely too strict to always succeed, so instead
have split it up into a set of smaller matches.
gcc/testsuite/ChangeLog:
PR d/94315
* gdc.dg/pr93038.d: Split dg-final into multiple tests.
* gdc.dg/pr93038b.d: Likewise.
Diff:
---
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/gdc.dg/pr93038.d | 4 +++-
gcc/testsuite/gdc.dg/pr93038b.d | 5 ++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bcaf2e727a3..ff021ac7787 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-01 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ PR d/94315
+ * gdc.dg/pr93038.d: Split scan-file into multiple tests.
+ * gdc.dg/pr93038b.d: Likewise.
+
2020-04-01 Iain Buclaw <ibuclaw@gdcproject.org>
PR d/94321
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;
reply other threads:[~2020-04-01 21:43 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=20200401214300.9B5E0385DC06@sourceware.org \
--to=ibuclaw@gcc.gnu.org \
--cc=gcc-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).