summaryrefslogtreecommitdiff
path: root/gcc/d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-03-29 13:27:22 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-03-29 19:25:27 +0200
commitafd9da8b8ad01268478fca6db3f63ca4c51b1900 (patch)
tree1a2c7f94756de4777e54d8bff22757d9a334e66b /gcc/d
parent85f6f317ec8c02beea0a8dcb9c9274ebcffc1da7 (diff)
testsuite: Move C++ tests in gdc.test into own subdirectory.
Tests have been moved into runnable_cxx as part of upstream dmd 3e10e2dd2. The extra flags required for tests that mix C++ and D are now limited to only a small subset of tests, rather than applied to all tests across gdc.dg and gdc.test. Reviewed-on: https://github.com/dlang/dmd/pull/10980 gcc/testsuite/ChangeLog: * gdc.test/runnable_cxx/runnable_cxx.exp: New file. * lib/gdc-utils.exp (gdc-do-test): Add case for runnable_cxx. * lib/gdc.exp (gdc_include_flags): Only add flags for libstdc++-v3 if GDC_INCLUDE_CXX_FLAGS is true. (gdc_link_flags): Likewise. (gdc_init): Move setting of default gdc test flags to... (gdc_target_compile): ...here.
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 a421448a287..7f0140708c6 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-d1a606599e7c2bea8fda8bf5e3ddceb486ae69ac
+3e10e2dd29e583f1d94d84de5e4bd858e0303669
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.