From e21a80e97de69f0d92bca9ed7d0f8e9d86e89628 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 29 Mar 2021 09:53:16 -0400 Subject: Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output Ninja versions prior to 1.6.0 occasionally print this message. --- ...enex-echo_target_depend_out-debug-in-release-graph-ninja-stdout.txt | 3 +-- 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" -- cgit v0.12