diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-08 17:16:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-12-16 15:12:25 (GMT) |
| commit | 6c40e0b25ec8475d73779ffbaa63a4230aa5e28d (patch) | |
| tree | f79f163ec0573ee870b2c01eb1a547be3d0324bb /Tests | |
| parent | 048a02d5bb842c783fad03105bb60e44227765ad (diff) | |
| download | CMake-6c40e0b25ec8475d73779ffbaa63a4230aa5e28d.zip CMake-6c40e0b25ec8475d73779ffbaa63a4230aa5e28d.tar.gz CMake-6c40e0b25ec8475d73779ffbaa63a4230aa5e28d.tar.bz2 | |
ConfigureLog: Version individual events instead of the whole log
In order to support multiple log versions without buffering the
entire log, move versioning to the level of individual events.
Multiple versions of an event may then be logged consecutively.
Issue: #23200
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/try_compile/Inspect-config.txt | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/try_run/ConfigureLog-config.txt | 13 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Tests/RunCMake/try_compile/Inspect-config.txt b/Tests/RunCMake/try_compile/Inspect-config.txt index fad24d7..47169cf 100644 --- a/Tests/RunCMake/try_compile/Inspect-config.txt +++ b/Tests/RunCMake/try_compile/Inspect-config.txt @@ -1,11 +1,8 @@ ^ --- -version: - major: 1 - minor: 0 events: - - kind: "try_compile" + kind: "try_compile-v1" backtrace: - "[^"]*/Modules/CMakeDetermineCompilerABI.cmake:[0-9]+ \(try_compile\)" - "[^"]*/Modules/CMakeTestCCompiler.cmake:[0-9]+ \(CMAKE_DETERMINE_COMPILER_ABI\)" @@ -20,7 +17,7 @@ events: stdout: \|.* exitCode: 0 - - kind: "try_compile" + kind: "try_compile-v1" backtrace: - "[^"]*/Modules/CMakeDetermineCompilerABI.cmake:[0-9]+ \(try_compile\)" - "[^"]*/Modules/CMakeTestCXXCompiler.cmake:[0-9]+ \(CMAKE_DETERMINE_COMPILER_ABI\)" diff --git a/Tests/RunCMake/try_run/ConfigureLog-config.txt b/Tests/RunCMake/try_run/ConfigureLog-config.txt index 5078793..602437e 100644 --- a/Tests/RunCMake/try_run/ConfigureLog-config.txt +++ b/Tests/RunCMake/try_run/ConfigureLog-config.txt @@ -1,11 +1,8 @@ ^ --- -version: - major: 1 - minor: 0 events: - - kind: "try_compile" + kind: "try_compile-v1" backtrace: - "[^"]*/Modules/CMakeDetermineCompilerABI.cmake:[0-9]+ \(try_compile\)" - "[^"]*/Modules/CMakeTestCCompiler.cmake:[0-9]+ \(CMAKE_DETERMINE_COMPILER_ABI\)" @@ -19,7 +16,7 @@ events: stdout: \|.* exitCode: 0 - - kind: "try_run" + kind: "try_run-v1" backtrace: - "ConfigureLog.cmake:[0-9]+ \(try_run\)" - "CMakeLists.txt:[0-9]+ \(include\)" @@ -35,7 +32,7 @@ events: variable: "RUN_RESULT" cached: true - - kind: "try_run" + kind: "try_run-v1" backtrace: - "ConfigureLog.cmake:[0-9]+ \(try_run\)" - "CMakeLists.txt:[0-9]+ \(include\)" @@ -56,7 +53,7 @@ events: Output, with backslash '\\\\', on stderr! exitCode: 12 - - kind: "try_run" + kind: "try_run-v1" backtrace: - "ConfigureLog.cmake:[0-9]+ \(try_run\)" - "CMakeLists.txt:[0-9]+ \(include\)" @@ -76,7 +73,7 @@ events: Output on stdout! exitCode: 12 - - kind: "try_run" + kind: "try_run-v1" backtrace: - "ConfigureLog.cmake:[0-9]+ \(try_run\)" - "CMakeLists.txt:[0-9]+ \(include\)" |