diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-21 12:59:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-21 12:59:30 (GMT) |
| commit | e094c8fa0aa3827b0e81660ad5e29d85b216d60f (patch) | |
| tree | d3fddef3aa2a9b72bc2bd1f7b55edb1ecde5b771 /Tests/RunCMake | |
| parent | 97670dbf2fa567998c26686caa4f03b6f4e78967 (diff) | |
| parent | 010560be6674def3ce02d05dcf2331230d0c4e91 (diff) | |
| download | CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.zip CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.tar.gz CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.tar.bz2 | |
Merge topic 'ninja-diagnose-missing-tool'
010560be Ninja: Fail early on when ninja build tool does not run
2d3aa942 cmGlobalGenerator: Allow FindMakeProgram to fail
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/Ninja/NinjaToolMissing-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/NinjaToolMissing.cmake | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 6 |
4 files changed, 13 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/NinjaToolMissing-result.txt b/Tests/RunCMake/Ninja/NinjaToolMissing-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Ninja/NinjaToolMissing-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt b/Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt new file mode 100644 index 0000000..1214288 --- /dev/null +++ b/Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt @@ -0,0 +1,6 @@ +^CMake Error at CMakeLists.txt:[0-9]+ \(project\): + Running + + 'ninja-tool-missing' '--version' + + failed with: diff --git a/Tests/RunCMake/Ninja/NinjaToolMissing.cmake b/Tests/RunCMake/Ninja/NinjaToolMissing.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/Ninja/NinjaToolMissing.cmake diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index 778f2c1..446dc3c 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -15,6 +15,12 @@ else() message(FATAL_ERROR "'ninja --version' reported:\n${ninja_out}") endif() +function(run_NinjaToolMissing) + set(RunCMake_MAKE_PROGRAM ninja-tool-missing) + run_cmake(NinjaToolMissing) +endfunction() +run_NinjaToolMissing() + function(run_CMP0058 case) # Use a single build tree for a few tests without cleaning. set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CMP0058-${case}-build) |