[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7100-g430ef8e

[Rolf Eike Beer]

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  430ef8ef059c8531ac5aaea3e71d40ffc6c58713 (commit)
       via  7868230d0ec465f82afc670b0104fa24a2c2eaa4 (commit)
      from  c4c87f28290aad67d75ba540bb962bc067073f5d (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=430ef8ef059c8531ac5aaea3e71d40ffc6c58713
commit 430ef8ef059c8531ac5aaea3e71d40ffc6c58713
Merge: c4c87f2 7868230
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 14 16:42:03 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 14 16:42:03 2014 -0500

    Merge topic 'skip-return-code' into next
    
    7868230d SkipReturnCode: add missing files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7868230d0ec465f82afc670b0104fa24a2c2eaa4
commit 7868230d0ec465f82afc670b0104fa24a2c2eaa4
Author:     Rolf Eike Beer <kde at opensource.sf-tec.de>
AuthorDate: Tue Jan 14 22:41:53 2014 +0100
Commit:     Rolf Eike Beer <kde at opensource.sf-tec.de>
CommitDate: Tue Jan 14 22:41:53 2014 +0100

    SkipReturnCode: add missing files

diff --git a/Tests/CTestTestSkipReturnCode/CMakeLists.txt b/Tests/CTestTestSkipReturnCode/CMakeLists.txt
new file mode 100644
index 0000000..26c4178
--- /dev/null
+++ b/Tests/CTestTestSkipReturnCode/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(CTestTestSkipReturnCode)
+include(CTest)
+
+add_test (NAME CMakeV1 COMMAND ${CMAKE_COMMAND} "--version")
+add_test (NAME CMakeV2 COMMAND ${CMAKE_COMMAND} "--version")
+
+set_tests_properties(CMakeV2 PROPERTIES SKIP_RETURN_CODE 0)
diff --git a/Tests/CTestTestSkipReturnCode/CTestConfig.cmake b/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
new file mode 100644
index 0000000..ad8e00e
--- /dev/null
+++ b/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
@@ -0,0 +1,7 @@
+set (CTEST_PROJECT_NAME "CTestTestSkipReturnCode")
+set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
+set (CTEST_DART_SERVER_VERSION "2")
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "www.cdash.org")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard")
+set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/Tests/CTestTestSkipReturnCode/test.cmake.in b/Tests/CTestTestSkipReturnCode/test.cmake.in
new file mode 100644
index 0000000..ebee01b
--- /dev/null
+++ b/Tests/CTestTestSkipReturnCode/test.cmake.in
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 2.4)
+
+# Settings:
+set(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTest")
+set(CTEST_SITE                          "@SITE@")
+set(CTEST_BUILD_NAME                    "CTestTest- at BUILDNAME@-SkipReturnCode")
+
+set(CTEST_SOURCE_DIRECTORY              "@CMake_SOURCE_DIR@/Tests/CTestTestSkipReturnCode")
+set(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestSkipReturnCode")
+set(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
+set(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@CMAKE_TEST_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+set(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
+set(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+
+#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+
+CTEST_START(Experimental)
+CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CTestTestSkipReturnCode/CMakeLists.txt                   |    8 ++++++++
 .../CTestConfig.cmake                                          |    2 +-
 .../{CTestTestSubdir => CTestTestSkipReturnCode}/test.cmake.in |    6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 Tests/CTestTestSkipReturnCode/CMakeLists.txt
 copy Tests/{CTestTestCycle => CTestTestSkipReturnCode}/CTestConfig.cmake (83%)
 copy Tests/{CTestTestSubdir => CTestTestSkipReturnCode}/test.cmake.in (93%)


hooks/post-receive
-- 
CMake