[Cmake-commits] CMake branch, next, updated. v2.8.2-881-g911c432

[Bill Hoffman]

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  911c4326bbbe730f417084ebce0030967de686b1 (commit)
       via  942ace83935fdb3272e026f21c56a6682b78d6de (commit)
      from  dc23a9af989d1d437fc331bf588acbdcd3ab4eec (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=911c4326bbbe730f417084ebce0030967de686b1
commit 911c4326bbbe730f417084ebce0030967de686b1
Merge: dc23a9a 942ace8
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 15:09:39 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 15:09:39 2010 -0400

    Merge topic 'add_vtk_contract_test' into next
    
    942ace8 Fix contract test so it is not hard coded to the vtk542 test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=942ace83935fdb3272e026f21c56a6682b78d6de
commit 942ace83935fdb3272e026f21c56a6682b78d6de
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 15:08:13 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Sep 21 15:08:13 2010 -0400

    Fix contract test so it is not hard coded to the vtk542 test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 82ea48b..895cb2a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1761,9 +1761,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   # then the dashboard will run a contract with CMake test of that
   # name.  For example CMAKE_CONTRACT_PROJECTS = vtk542 would run
   # the vtk542 contract test.
+  # For each Contract test, the project should provide a directory
+  # with at least one CMakeLists.txt file that uses ExternalProject
+  # to download and configure the project. The directory should also
+  # contain a RunTest.cmake file that has a single set of the format:
+  # SET(project_RUN_TEST testToRun)
+  # The testToRun should be a test executable that can be run to
+  # smoke test the build.
   FOREACH(project ${CMAKE_CONTRACT_PROJECTS})
+    INCLUDE(Contracts/${project}/RunTest.cmake)
     ADD_TEST_MACRO(Contracts.${project}
-      VTK-build/bin/CommonCxxTests otherArrays)
+      ${${project}_RUN_TEST})
     SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
   ENDFOREACH()
 ENDIF(BUILD_TESTING)
diff --git a/Tests/Contracts/vtk542/RunTest.cmake b/Tests/Contracts/vtk542/RunTest.cmake
new file mode 100644
index 0000000..4f48e5c
--- /dev/null
+++ b/Tests/Contracts/vtk542/RunTest.cmake
@@ -0,0 +1 @@
+SET(vtk542_RUN_TEST VTK-build/bin/CommonCxxTests otherArrays)

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

Summary of changes:
 Tests/CMakeLists.txt                 |   10 +++++++++-
 Tests/Contracts/vtk542/RunTest.cmake |    1 +
 2 files changed, 10 insertions(+), 1 deletions(-)
 create mode 100644 Tests/Contracts/vtk542/RunTest.cmake


hooks/post-receive
-- 
CMake