diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2010-02-03 21:32:26 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2010-02-03 21:32:26 (GMT) |
| commit | c87282ce52f6097a87106de3c36630f6867b10e6 (patch) | |
| tree | 56885edc921f61a7d0155a2616506010d5f8ea7d | |
| parent | 4864d48f27bfd92a20b4069565b960f4be979dda (diff) | |
| download | CMake-c87282ce52f6097a87106de3c36630f6867b10e6.zip CMake-c87282ce52f6097a87106de3c36630f6867b10e6.tar.gz CMake-c87282ce52f6097a87106de3c36630f6867b10e6.tar.bz2 | |
Re-enabled Scheduler test and fixed the underlying problem.
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index a79f131..b6226a3 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -325,7 +325,7 @@ void cmCTestMultiProcessHandler::WriteCostData(int index, float cost) std::string fname = this->CTest->GetBinaryDir() + "/Testing/Temporary/CTestCostData.txt"; std::fstream fout; - fout.open(fname.c_str(), std::ios::app); + fout.open(fname.c_str(), std::ios::out | std::ios::app); fout << index << " " << cost << "\n"; fout.close(); } diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d109828..8a83d72 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1285,16 +1285,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log" ) - #CONFIGURE_FILE( - # "${CMake_SOURCE_DIR}/Tests/CTestTestScheduler/test.cmake.in" - # "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake" - # @ONLY ESCAPE_QUOTES) - #ADD_TEST(CTestTestScheduler ${CMAKE_CTEST_COMMAND} - # -S "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake" -V - # --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 5.*Start 5.*Start 4.*Start 3.*Start 2.*Start 1") + CONFIGURE_FILE( + "${CMake_SOURCE_DIR}/Tests/CTestTestScheduler/test.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake" + @ONLY ESCAPE_QUOTES) + ADD_TEST(CTestTestScheduler ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake" -V + --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 5.*Start 5.*Start 4.*Start 3.*Start 2.*Start 1") CONFIGURE_FILE( "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" |