From 8dcdd4351fd6236f05fbb613cd805fb41d2a1865 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Thu, 10 Jun 2021 16:09:04 +0200 Subject: Tests: recognize Xcode 13 linker warning The linker shipped with Xcode 13 changed the architecture mismatch linker warning into: ``` ld: warning: ignoring file libfoo.a, building for macOS-x86_64 but attempting to link with file built for macOS-i386 ``` --- Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) -- cgit v0.12 From a7bbbbf73b7c5bb4c17ca04c31894884e55d066c Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Thu, 10 Jun 2021 22:50:06 +0200 Subject: Tests: ignore Xcode DVTPlugInManager output --- Tests/RunCMake/RunCMake.cmake | 1 + 1 file changed, 1 insertion(+) 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" -- cgit v0.12