diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-02 14:09:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-12-02 14:09:38 (GMT) |
| commit | f8fed12250d7c73823087c2e07ea5d3bf2005163 (patch) | |
| tree | 65345b25a3ddc45c978fa703c53a7816b0ef7b61 /Tests | |
| parent | 7ea665b74da322e96dd3e7f90075143c2957728c (diff) | |
| download | CMake-f8fed12250d7c73823087c2e07ea5d3bf2005163.zip CMake-f8fed12250d7c73823087c2e07ea5d3bf2005163.tar.gz CMake-f8fed12250d7c73823087c2e07ea5d3bf2005163.tar.bz2 | |
Tests: Enable RunCMake.file-GET_RUNTIME_DEPENDENCIES linux cases on XL
These were excluded with the XL and XLClang compilers because one
such compiler in nightly testing hard-codes `--enable-new-dtags`.
Add a way to disable the cases via local configuration instead so that
we can run them on the rest of the XL compilers.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 0fe4919..78615d9 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -760,8 +760,11 @@ add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DMSYS set_property(TEST RunCMake.install APPEND PROPERTY LABELS "ISPC") +if(DEFINED CMake_COMPILER_FORCES_NEW_DTAGS) + list(APPEND file-GET_RUNTIME_DEPENDENCIES_ARGS + -DCMake_COMPILER_FORCES_NEW_DTAGS=${CMake_COMPILER_FORCES_NEW_DTAGS}) +endif() add_RunCMake_test(file-GET_RUNTIME_DEPENDENCIES - -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DCMake_INSTALL_NAME_TOOL_BUG=${CMake_INSTALL_NAME_TOOL_BUG} ) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake index 75bfc07..43b406b 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake @@ -59,7 +59,7 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(ENV{LDFLAGS} "${new_ldflags}") endif() - if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL") + if(NOT CMake_COMPILER_FORCES_NEW_DTAGS) run_install_test(linux) run_install_test(linux-parent-rpath-propagation) run_install_test(file-filter) |