Răsfoiți Sursa

Re-enabled Scheduler test and fixed the underlying problem.

Zach Mullen 15 ani în urmă
părinte
comite
c87282ce52
2 a modificat fișierele cu 11 adăugiri și 11 ștergeri
  1. 1 1
      Source/CTest/cmCTestMultiProcessHandler.cxx
  2. 10 10
      Tests/CMakeLists.txt

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

+ 10 - 10
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"