diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-09 15:37:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-09 15:37:15 (GMT) |
| commit | fcf60ec1bcb0fa3224bfe80f8279c29670cefd19 (patch) | |
| tree | 41cbfd2a33328a83a3b59d191e199a517602d94e | |
| parent | 1019789f2aadce6896182c1696aabf883dce4905 (diff) | |
| parent | 59f844521912605b16183da300ab98ad029ca06d (diff) | |
| download | CMake-fcf60ec1bcb0fa3224bfe80f8279c29670cefd19.zip CMake-fcf60ec1bcb0fa3224bfe80f8279c29670cefd19.tar.gz CMake-fcf60ec1bcb0fa3224bfe80f8279c29670cefd19.tar.bz2 | |
Merge topic 'test-macos-framework-type-universal-binary'
59f84452 Tests: Fix RunCMake.Framework expectation for universal binaries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !814
| -rw-r--r-- | Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt index 8d90f5f..f664db9 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt @@ -1 +1,3 @@ -.*/Framework: Mach-O[^\n]* dynamically linked shared library.* +.*/Framework:( Mach-O universal binary with [^ +]*)? Mach-O[^ +]* dynamically linked shared library.* diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt index c9f50b6..532cfed 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt @@ -1 +1,2 @@ -.*/Framework: current ar archive random library.* +.*/Framework:( Mach-O universal binary with [^ +]*)? current ar archive random library.* |