1
0
Эх сурвалжийг харах

Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0

The output of `otool -vf` now contains additional content that happens
to be matched by our architectures regex.  Make the regex more strict.
Brad King 4 жил өмнө
parent
commit
75901f0472

+ 2 - 2
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake

@@ -9,8 +9,8 @@ function(verify_architectures file)
     return()
   endif()
 
-  string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out})
-  string(REPLACE "architecture " "" actual "${architectures}")
+  string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
+  string(REPLACE "\narchitecture " "" actual "${architectures}")
   list(SORT actual)
 
   set(expected arm64 armv7 i386 x86_64)

+ 2 - 2
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake

@@ -9,8 +9,8 @@ function(verify_architectures file)
     return()
   endif()
 
-  string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out})
-  string(REPLACE "architecture " "" actual "${architectures}")
+  string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
+  string(REPLACE "\narchitecture " "" actual "${architectures}")
   list(SORT actual)
 
   set(expected armv7 x86_64)