From 942ace83935fdb3272e026f21c56a6682b78d6de Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 21 Sep 2010 15:08:13 -0400 Subject: [PATCH] Fix contract test so it is not hard coded to the vtk542 test. --- Tests/CMakeLists.txt | 10 +++++++++- Tests/Contracts/vtk542/RunTest.cmake | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Tests/Contracts/vtk542/RunTest.cmake diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 82ea48bc7..895cb2a0a 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 000000000..4f48e5cd2 --- /dev/null +++ b/Tests/Contracts/vtk542/RunTest.cmake @@ -0,0 +1 @@ +SET(vtk542_RUN_TEST VTK-build/bin/CommonCxxTests otherArrays)