aboutsummaryrefslogtreecommitdiff
path: root/gcc/d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2019-03-30 22:10:12 +0000
committerIain Buclaw <ibuclaw@gcc.gnu.org>2019-03-30 22:10:12 +0000
commit1821f97bb447dcfcb1fbdb780affbadc9ff03907 (patch)
tree6a2a1cb47fe4078c9dfa0cd26c6d53c2919ee98e /gcc/d
parent0324a4978e151e4a1cb5aa93265d2876af581baa (diff)
downloadgcc-1821f97bb447dcfcb1fbdb780affbadc9ff03907.zip
gcc-1821f97bb447dcfcb1fbdb780affbadc9ff03907.tar.gz
gcc-1821f97bb447dcfcb1fbdb780affbadc9ff03907.tar.bz2
testsuite/gdc.test: Merge upstream dmd 5dd3eccc3
The D2 testsuite script has been updated to handle EXTRA_SOURCES and EXTRA_FILES settings being split across multiple lines, which is how they appear in upstream. Reviewed-on: https://github.com/dlang/dmd/pull/9517 gcc/testsuite/ChangeLog: 2019-03-30 Iain Buclaw <ibuclaw@gdcproject.org> * gdc.test/gdc-test.exp (gdc-copy-extra): Append copied files to cleanup_extra_files. (dmd2dg): Copy additional files after test is processed. (gdc-do-test): Remove all copied files after test. From-SVN: r270038
Diffstat (limited to 'gcc/d')
-rw-r--r--gcc/d/dmd/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index ffad6cb..31ea106 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-ab702e73e56aefb3b77b8f8f42da94bc22143eeb
+5dd3eccc3b0758346f77bee3cdc3f6bd15de339b
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.