kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled Scheduler test and fixed the underlying problem.

This commit is contained in:
Zach Mullen 2010-02-03 16:32:26 -05:00
parent 4864d48f27
commit c87282ce52
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -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();
}

20
Tests/CMakeLists.txt
View File

@ -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"