From 75901f0472016adfe89e246f3f0cb32d57513f8a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 30 Sep 2021 11:46:56 -0400 Subject: 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. --- .../RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake | 4 ++-- .../XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake index a1c0671..53b885d 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake +++ b/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) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake index 83da17d..37bb4d5 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake +++ b/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) -- cgit v0.12