diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-29 13:53:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-29 13:55:57 (GMT) |
| commit | e21a80e97de69f0d92bca9ed7d0f8e9d86e89628 (patch) | |
| tree | cbf78d334eaf79ef04a7658bee3e8f3c071c788c | |
| parent | 2a2afe0ae4eeb417583cf3d84ebbcb365973bbe0 (diff) | |
| download | CMake-e21a80e97de69f0d92bca9ed7d0f8e9d86e89628.zip CMake-e21a80e97de69f0d92bca9ed7d0f8e9d86e89628.tar.gz CMake-e21a80e97de69f0d92bca9ed7d0f8e9d86e89628.tar.bz2 | |
Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output
Ninja versions prior to 1.6.0 occasionally print this message.
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt index 45f2e57..d90a2f3 100644 --- a/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt +++ b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt @@ -1,5 +1,4 @@ -^(Recompacting log\.\.\. -)?\[1/2\] Generating depend_Debug\.txt +^\[1/2\] Generating depend_Debug\.txt depend_Debug\.txt \[2/2\] echo_target_depend_out echo_target_depend_out_Debug\.txt$ diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index a26f632..494f87f 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -152,6 +152,7 @@ function(run_cmake test) "|clang[^:]*: warning: the object size sanitizer has no effect at -O0, but is explicitly enabled:" "|Error kstat returned" "|Hit xcodebuild bug" + "|Recompacting log\\.\\.\\." "|LICENSE WARNING:" "|Your license to use PGI[^\n]*expired" |