From 918b89b7623b6c42b09f37b7e3ef807d1abbabb8 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Wed, 1 Apr 2020 23:37:06 +0200 Subject: [PATCH] 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. --- 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 + + PR d/94315 + * gdc.dg/pr93038.d: Split scan-file into multiple tests. + * gdc.dg/pr93038b.d: Likewise. + 2020-04-01 Iain Buclaw 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; -- 2.30.2