diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-09 13:09:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-09 13:09:37 (GMT) |
| commit | 41670c089b1d0ee80c1bfcdf64d9ff11912172e6 (patch) | |
| tree | 4a2b5ec532e7a320a970c0ef9df5156f6d47e134 | |
| parent | 2d60f5c7a67fb7d0ddc32d2332ea098bce81ea4c (diff) | |
| parent | 101ac06b2874b451e167f19d55fc0a8b684d7b44 (diff) | |
| download | CMake-41670c089b1d0ee80c1bfcdf64d9ff11912172e6.zip CMake-41670c089b1d0ee80c1bfcdf64d9ff11912172e6.tar.gz CMake-41670c089b1d0ee80c1bfcdf64d9ff11912172e6.tar.bz2 | |
Merge topic 'ninja-dev' into release-3.28
101ac06b28 Tests: Update for changes to upstream ninja development version
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9053
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/ISPCDuplicateTargetNinja-stderr.txt | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index 69f2587..42ab1d8 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -347,6 +347,9 @@ if("${ninja_version}" VERSION_LESS 1.6) message(WARNING "Ninja is too old; skipping rest of test.") return() endif() +if("${ninja_version}" VERSION_LESS 1.12) + set(maybe_w_dupbuild_err -w dupbuild=err) +endif() set(ninja_output_path_prefixes "sub") if(NOT CMAKE_C_COMPILER_ID STREQUAL "OrangeC") @@ -364,14 +367,14 @@ endforeach(ninja_output_path_prefix) function (run_PreventTargetAliasesDupBuildRule) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PreventTargetAliasesDupBuildRule-build) run_cmake(PreventTargetAliasesDupBuildRule) - run_ninja("${RunCMake_TEST_BINARY_DIR}" -w dupbuild=err) + run_ninja("${RunCMake_TEST_BINARY_DIR}" ${maybe_w_dupbuild_err}) endfunction () run_PreventTargetAliasesDupBuildRule() function (run_PreventConfigureFileDupBuildRule) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PreventConfigureFileDupBuildRule-build) run_cmake(PreventConfigureFileDupBuildRule) - run_ninja("${RunCMake_TEST_BINARY_DIR}" -w dupbuild=err) + run_ninja("${RunCMake_TEST_BINARY_DIR}" ${maybe_w_dupbuild_err}) endfunction() run_PreventConfigureFileDupBuildRule() @@ -380,7 +383,7 @@ function (run_ChangeBuildType) set(RunCMake_TEST_OPTIONS "-DCMAKE_BUILD_TYPE:STRING=Debug") run_cmake(ChangeBuildType) unset(RunCMake_TEST_OPTIONS) - run_ninja("${RunCMake_TEST_BINARY_DIR}" -w dupbuild=err) + run_ninja("${RunCMake_TEST_BINARY_DIR}" ${maybe_w_dupbuild_err}) endfunction() run_ChangeBuildType() diff --git a/Tests/RunCMake/try_compile/ISPCDuplicateTargetNinja-stderr.txt b/Tests/RunCMake/try_compile/ISPCDuplicateTargetNinja-stderr.txt index 99248bf..155aff9 100644 --- a/Tests/RunCMake/try_compile/ISPCDuplicateTargetNinja-stderr.txt +++ b/Tests/RunCMake/try_compile/ISPCDuplicateTargetNinja-stderr.txt @@ -1 +1,5 @@ -.*ninja: error: .* multiple rules generate.*src.ispc_avx512skx.o.* +ninja: error:([^ +]+multiple rules generate[^ +]+src\.ispc_avx512skx\.o|[^ +]+src\.ispc_avx512skx\.o[^ +]+is defined as an output multiple times) |