diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-29 13:27:22 +0200 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-29 19:25:27 +0200 |
commit | afd9da8b8ad01268478fca6db3f63ca4c51b1900 (patch) | |
tree | 1a2c7f94756de4777e54d8bff22757d9a334e66b /gcc/testsuite/gdc.test | |
parent | 85f6f317ec8c02beea0a8dcb9c9274ebcffc1da7 (diff) | |
download | gcc-afd9da8b8ad01268478fca6db3f63ca4c51b1900.zip gcc-afd9da8b8ad01268478fca6db3f63ca4c51b1900.tar.gz gcc-afd9da8b8ad01268478fca6db3f63ca4c51b1900.tar.bz2 |
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/testsuite/gdc.test')
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/cabi1.d (renamed from gcc/testsuite/gdc.test/runnable/cabi1.d) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/cpp_abi_tests.d (renamed from gcc/testsuite/gdc.test/runnable/cpp_abi_tests.d) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/cppa.d (renamed from gcc/testsuite/gdc.test/runnable/cppa.d) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/externmangle.d (renamed from gcc/testsuite/gdc.test/runnable/externmangle.d) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/externmangle2.d (renamed from gcc/testsuite/gdc.test/runnable/externmangle2.d) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/extra-files/cabi2.cpp (renamed from gcc/testsuite/gdc.test/runnable/extra-files/cabi2.cpp) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/extra-files/cpp_abi_tests.cpp (renamed from gcc/testsuite/gdc.test/runnable/extra-files/cpp_abi_tests.cpp) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/extra-files/cppb.cpp (renamed from gcc/testsuite/gdc.test/runnable/extra-files/cppb.cpp) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle.cpp (renamed from gcc/testsuite/gdc.test/runnable/extra-files/externmangle.cpp) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle2.cpp (renamed from gcc/testsuite/gdc.test/runnable/extra-files/externmangle2.cpp) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable_cxx/runnable_cxx.exp | 46 |
11 files changed, 46 insertions, 0 deletions
diff --git a/gcc/testsuite/gdc.test/runnable/cabi1.d b/gcc/testsuite/gdc.test/runnable_cxx/cabi1.d index 3a914cd..3a914cd 100644 --- a/gcc/testsuite/gdc.test/runnable/cabi1.d +++ b/gcc/testsuite/gdc.test/runnable_cxx/cabi1.d diff --git a/gcc/testsuite/gdc.test/runnable/cpp_abi_tests.d b/gcc/testsuite/gdc.test/runnable_cxx/cpp_abi_tests.d index 83e1cff..83e1cff 100644 --- a/gcc/testsuite/gdc.test/runnable/cpp_abi_tests.d +++ b/gcc/testsuite/gdc.test/runnable_cxx/cpp_abi_tests.d diff --git a/gcc/testsuite/gdc.test/runnable/cppa.d b/gcc/testsuite/gdc.test/runnable_cxx/cppa.d index b9b4832..b9b4832 100644 --- a/gcc/testsuite/gdc.test/runnable/cppa.d +++ b/gcc/testsuite/gdc.test/runnable_cxx/cppa.d diff --git a/gcc/testsuite/gdc.test/runnable/externmangle.d b/gcc/testsuite/gdc.test/runnable_cxx/externmangle.d index 9099f94..9099f94 100644 --- a/gcc/testsuite/gdc.test/runnable/externmangle.d +++ b/gcc/testsuite/gdc.test/runnable_cxx/externmangle.d diff --git a/gcc/testsuite/gdc.test/runnable/externmangle2.d b/gcc/testsuite/gdc.test/runnable_cxx/externmangle2.d index 74beb25..74beb25 100644 --- a/gcc/testsuite/gdc.test/runnable/externmangle2.d +++ b/gcc/testsuite/gdc.test/runnable_cxx/externmangle2.d diff --git a/gcc/testsuite/gdc.test/runnable/extra-files/cabi2.cpp b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cabi2.cpp index 31e5286..31e5286 100644 --- a/gcc/testsuite/gdc.test/runnable/extra-files/cabi2.cpp +++ b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cabi2.cpp diff --git a/gcc/testsuite/gdc.test/runnable/extra-files/cpp_abi_tests.cpp b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cpp_abi_tests.cpp index 63f74a2..63f74a2 100644 --- a/gcc/testsuite/gdc.test/runnable/extra-files/cpp_abi_tests.cpp +++ b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cpp_abi_tests.cpp diff --git a/gcc/testsuite/gdc.test/runnable/extra-files/cppb.cpp b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cppb.cpp index 587145c..587145c 100644 --- a/gcc/testsuite/gdc.test/runnable/extra-files/cppb.cpp +++ b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/cppb.cpp diff --git a/gcc/testsuite/gdc.test/runnable/extra-files/externmangle.cpp b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle.cpp index da3e844..da3e844 100644 --- a/gcc/testsuite/gdc.test/runnable/extra-files/externmangle.cpp +++ b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle.cpp diff --git a/gcc/testsuite/gdc.test/runnable/extra-files/externmangle2.cpp b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle2.cpp index b481348..b481348 100644 --- a/gcc/testsuite/gdc.test/runnable/extra-files/externmangle2.cpp +++ b/gcc/testsuite/gdc.test/runnable_cxx/extra-files/externmangle2.cpp diff --git a/gcc/testsuite/gdc.test/runnable_cxx/runnable_cxx.exp b/gcc/testsuite/gdc.test/runnable_cxx/runnable_cxx.exp new file mode 100644 index 0000000..a37376a --- /dev/null +++ b/gcc/testsuite/gdc.test/runnable_cxx/runnable_cxx.exp @@ -0,0 +1,46 @@ +# Copyright (C) 2012-2020 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# <http://www.gnu.org/licenses/>. + +# Runnable C++ tests for the D2 testsuite. + +# Load support procs. +load_lib gdc-dg.exp +load_lib gdc-utils.exp + +# If the D runtime library is missing, bail. +if { ![check_effective_target_d_runtime] } { + return +} + +# We are mixing D and C++ code, need to pull in libstdc++ +global GDC_INCLUDE_CXX_FLAGS +set GDC_INCLUDE_CXX_FLAGS 1 + +# Initialize `dg'. +dg-init + +# Main loop. +if [check_no_compiler_messages extern_c++_tests assembly { + // C++ + int main() { return 0; } +}] { + gdc-do-test [glob -nocomplain $srcdir/$subdir/*.d] +} + +set GDC_INCLUDE_CXX_FLAGS 0 + +# All done. +dg-finish |