diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-30 11:46:56 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-05 09:13:23 -0400 |
| commit | 75901f0472016adfe89e246f3f0cb32d57513f8a (patch) | |
| tree | 25b685c4e92fb04803c9f0608d217de5dfe16ec4 | |
| parent | 0e86fea0bee63592e024c330b22939ec7846712e (diff) | |
| download | cmake-75901f0472016adfe89e246f3f0cb32d57513f8a.tar.gz | |
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.
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/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 a1c06718f2..53b885d29b 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 83da17da7e..37bb4d5946 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) |