ソースを参照

Merge topic 'xcode13-linker-output'

a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output
8dcdd4351f Tests: recognize Xcode 13 linker warning

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6216
Brad King 4 年 前
コミット
f245a20ad0
2 ファイル変更2 行追加1 行削除
  1. 1 1
      Tests/CMakeLists.txt
  2. 1 0
      Tests/RunCMake/RunCMake.cmake

+ 1 - 1
Tests/CMakeLists.txt

@@ -538,7 +538,7 @@ if(BUILD_TESTING)
   if(CTEST_TEST_OSX_ARCH)
   if(CTEST_TEST_OSX_ARCH)
     ADD_TEST_MACRO(Architecture Architecture)
     ADD_TEST_MACRO(Architecture Architecture)
     set_tests_properties(Architecture PROPERTIES
     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()
   endif()
 
 
   list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
   list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

+ 1 - 0
Tests/RunCMake/RunCMake.cmake

@@ -155,6 +155,7 @@ function(run_cmake test)
     "|contact PGI Sales at"
     "|contact PGI Sales at"
 
 
     "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:"
     "|[^\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]*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]*objc[^\n]*: Class AMSupportURL[^\n]* One of the two will be used. Which one is undefined."
     "|[^\n]*is a member of multiple groups"
     "|[^\n]*is a member of multiple groups"