diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-04 20:46:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-04 20:46:16 (GMT) |
| commit | d04e10dd7ef0f756cfe0371f25554deb54353265 (patch) | |
| tree | 23c252f2a0230bb69a7e390d934574e23d1fbf74 /Tests/CMakeLists.txt | |
| parent | 70950edde06305f9bfcb2f6bfd5442add72dc947 (diff) | |
| parent | 6b0c7ded5777c5b4c703bbe59be5c6afcebb879d (diff) | |
| download | CMake-d04e10dd7ef0f756cfe0371f25554deb54353265.zip CMake-d04e10dd7ef0f756cfe0371f25554deb54353265.tar.gz CMake-d04e10dd7ef0f756cfe0371f25554deb54353265.tar.bz2 | |
Merge topic 'negative-test-costs'
6b0c7de Support explicitly set test costs in non-parallel testing.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c86accf..faaa177 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1405,7 +1405,20 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ --output-log "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/testOutput.log" ) SET_TESTS_PROPERTIES(CTestTestScheduler PROPERTIES - PASS_REGULAR_EXPRESSION "Start 1.*Start 2.*Start 3.*Start 4.*Start 4.*Start 3.*Start 2.*Start 1") + PASS_REGULAR_EXPRESSION "Start 1.*Start 2.*Start 3.*Start 4.*Start 4.*Start 3.*Start 2.*Start 1" + RESOURCE_LOCK "CostData") + + CONFIGURE_FILE( + "${CMake_SOURCE_DIR}/Tests/CTestTestCostSerial/test.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestCostSerial/test.cmake" + @ONLY ESCAPE_QUOTES) + ADD_TEST(CTestTestCostSerial ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestTestCostSerial/test.cmake" -V + --output-log "${CMake_BINARY_DIR}/Tests/CTestTestCostSerial/testOutput.log" + ) + SET_TESTS_PROPERTIES(CTestTestCostSerial PROPERTIES + PASS_REGULAR_EXPRESSION "Start 2.*Start 3.*Start 1.*Start 2.*Start 3.*Start 1" + RESOURCE_LOCK "CostData") CONFIGURE_FILE( "${CMake_SOURCE_DIR}/Tests/CTestTestStopTime/test.cmake.in" |