summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-09-21 19:08:13 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2010-09-21 19:08:13 (GMT)
commit942ace83935fdb3272e026f21c56a6682b78d6de (patch)
tree19017daa031ea3432cf654a2819e0ac59a30e6bf /Tests
parentfd343a1a36c4f6ff62f67acfc5506fb2592858b3 (diff)
downloadCMake-942ace83935fdb3272e026f21c56a6682b78d6de.zip
CMake-942ace83935fdb3272e026f21c56a6682b78d6de.tar.gz
CMake-942ace83935fdb3272e026f21c56a6682b78d6de.tar.bz2
Fix contract test so it is not hard coded to the vtk542 test.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt10
-rw-r--r--Tests/Contracts/vtk542/RunTest.cmake1
2 files changed, 10 insertions, 1 deletions
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)