This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 00c696b2c84ec8592bfed65f4d36855ef34da071 (commit) via da762ab49907d2cccfbbdb0ba1832cd2912cd563 (commit) from d280af5eb7e1491ab0afcf374136cb80eb4cd1c5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00c696b2c84ec8592bfed65f4d36855ef34da071 commit 00c696b2c84ec8592bfed65f4d36855ef34da071 Merge: d280af5 da762ab Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Jun 3 11:51:04 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jun 3 11:51:04 2014 -0400 Merge topic 'fix-build-crash-on-bad-generator' into next da762ab4 cmake: Test --build option startup error cases http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da762ab49907d2cccfbbdb0ba1832cd2912cd563 commit da762ab49907d2cccfbbdb0ba1832cd2912cd563 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Jun 3 11:50:33 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Jun 3 11:50:33 2014 -0400 cmake: Test --build option startup error cases Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR. diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index ada4cab..3aaeac0 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -1,5 +1,12 @@ include(RunCMake) +run_cmake_command(build-no-cache + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}) +run_cmake_command(build-no-generator + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-no-generator) +run_cmake_command(build-bad-generator + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator) + if(UNIX) run_cmake_command(E_create_symlink-missing-dir ${CMAKE_COMMAND} -E create_symlink T missing-dir/L diff --git a/Tests/RunCMake/CommandLine/build-bad-generator-result.txt b/Tests/RunCMake/CommandLine/build-bad-generator-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-bad-generator-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt b/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt new file mode 100644 index 0000000..1103407 --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt @@ -0,0 +1 @@ +^Error: could create CMAKE_GENERATOR "Bad Generator"$ diff --git a/Tests/RunCMake/CommandLine/build-no-cache-result.txt b/Tests/RunCMake/CommandLine/build-no-cache-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-no-cache-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt b/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt new file mode 100644 index 0000000..40dd3c0 --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt @@ -0,0 +1 @@ +^Error: could not load cache$ diff --git a/Tests/RunCMake/CommandLine/build-no-generator-result.txt b/Tests/RunCMake/CommandLine/build-no-generator-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-no-generator-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt b/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt new file mode 100644 index 0000000..40ad030 --- /dev/null +++ b/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt @@ -0,0 +1 @@ +^Error: could not find CMAKE_GENERATOR in Cache$ diff --git a/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt b/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt new file mode 100644 index 0000000..e34af44 --- /dev/null +++ b/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt @@ -0,0 +1 @@ +CMAKE_GENERATOR:INTERNAL=Bad Generator diff --git a/Tests/RunCMake/CommandLine/cache-no-generator/CMakeCache.txt b/Tests/RunCMake/CommandLine/cache-no-generator/CMakeCache.txt new file mode 100644 index 0000000..e69de29 ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 7 +++++++ .../build-bad-generator-result.txt} | 0 Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt | 1 + .../build-no-cache-result.txt} | 0 Tests/RunCMake/CommandLine/build-no-cache-stderr.txt | 1 + .../build-no-generator-result.txt} | 0 Tests/RunCMake/CommandLine/build-no-generator-stderr.txt | 1 + Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt | 1 + .../RunCMake/CommandLine/cache-no-generator/CMakeCache.txt | 0 9 files changed, 11 insertions(+) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-bad-generator-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-no-cache-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/build-no-cache-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-no-generator-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/build-no-generator-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/cache-no-generator/CMakeCache.txt (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits