diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-14 13:45:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-14 13:45:44 (GMT) |
| commit | f245a20ad033f6977335cc89bde59ec8de8445c8 (patch) | |
| tree | 67cddf2d498826a123d10525ec0f9a8d78cdff23 | |
| parent | 06dc53fc40e9e24eb48b6f6e0fc1ca52e8e9ef68 (diff) | |
| parent | a7bbbbf73b7c5bb4c17ca04c31894884e55d066c (diff) | |
| download | CMake-f245a20ad033f6977335cc89bde59ec8de8445c8.zip CMake-f245a20ad033f6977335cc89bde59ec8de8445c8.tar.gz CMake-f245a20ad033f6977335cc89bde59ec8de8445c8.tar.bz2 | |
Merge topic 'xcode13-linker-output'
a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output
8dcdd4351f Tests: recognize Xcode 13 linker warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6216
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 57d75e1..2f9b7ff 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -538,7 +538,7 @@ if(BUILD_TESTING) if(CTEST_TEST_OSX_ARCH) ADD_TEST_MACRO(Architecture Architecture) set_tests_properties(Architecture PROPERTIES - PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked)") + PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked|but attempting to link with file built for)") endif() list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index b4a57b2..3363a57 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -155,6 +155,7 @@ function(run_cmake test) "|contact PGI Sales at" "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:" + "|[^\n]*xcodebuild[^\n]*DVTPlugInManager" "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type" "|[^\n]*objc[^\n]*: Class AMSupportURL[^\n]* One of the two will be used. Which one is undefined." "|[^\n]*is a member of multiple groups" |