diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-01 23:37:06 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-01 23:42:45 +0200 |
| commit | 918b89b7623b6c42b09f37b7e3ef807d1abbabb8 (patch) | |
| tree | 530a35f4783f67cdefd5ebdd92b799234c334d37 | |
| parent | fb25041e11d92ea2df2e92065b256f8e5aa58a6c (diff) | |
| download | gcc-918b89b7623b6c42b09f37b7e3ef807d1abbabb8.zip gcc-918b89b7623b6c42b09f37b7e3ef807d1abbabb8.tar.gz gcc-918b89b7623b6c42b09f37b7e3ef807d1abbabb8.tar.bz2 | |
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.
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.dg/pr93038.d | 4 | ||||
| -rw-r--r-- | 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 bcaf2e7..ff021ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 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 * gdc.dg/pr92216.d: Update to work on targets with 16 or 32-bit pointers. diff --git a/gcc/testsuite/gdc.dg/pr93038.d b/gcc/testsuite/gdc.dg/pr93038.d index 4e09690..79d30a8 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 04177a7..18649b8 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; |