[Cmake-commits] [cmake-commits] hoffman committed cmCTestScriptHandler.cxx 1.43 1.43.2.1 cmCTestTestCommand.cxx 1.10 1.10.12.1 cmCTestTestCommand.h 1.6 1.6.12.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv12155/Source/CTest

Modified Files:
      Tag: CMake-2-6
	cmCTestScriptHandler.cxx cmCTestTestCommand.cxx 
	cmCTestTestCommand.h 
Log Message:
ENH: merge in RC 5


Index: cmCTestTestCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.h,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -C 2 -d -r1.6 -r1.6.12.1
*** cmCTestTestCommand.h	29 Mar 2006 17:01:24 -0000	1.6
--- cmCTestTestCommand.h	2 Dec 2008 12:07:40 -0000	1.6.12.1
***************
*** 45,49 ****
     * The name of the command as specified in CMakeList.txt.
     */
!   virtual const char* GetName() { return "CTEST_TEST";}
  
    /**
--- 45,49 ----
     * The name of the command as specified in CMakeList.txt.
     */
!   virtual const char* GetName() { return "ctest_test";}
  
    /**
***************
*** 61,67 ****
      {
      return
!       "  CTEST_TEST([BUILD build_dir] [RETURN_VALUE res])\n"
        "Tests the given build directory and stores results in Test.xml. The "
!       "second argument is a variable that will hold value.";
      }
  
--- 61,74 ----
      {
      return
!       "  ctest_test([BUILD build_dir]\n"
!       "             [START start number] [END end number]\n"
!       "             [STRIDE stride number] [EXCLUDE exclude regex ]\n"
!       "             [INCLUDE include regex] [RETURN_VALUE res] )\n"
        "Tests the given build directory and stores results in Test.xml. The "
!       "second argument is a variable that will hold value. Optionally, "
!       "you can specify the starting test number START, the ending test number "
!       "END, the number of tests to skip between each test STRIDE, a regular "
!       "expression for tests to run INCLUDE, or a regular expression for tests "
!       "to not run EXCLUDE.";
      }
  
***************
*** 78,81 ****
--- 85,90 ----
      ctt_END,
      ctt_STRIDE,
+     ctt_EXCLUDE,
+     ctt_INCLUDE,
      ctt_LAST
    };

Index: cmCTestTestCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.cxx,v
retrieving revision 1.10
retrieving revision 1.10.12.1
diff -C 2 -d -r1.10 -r1.10.12.1
*** cmCTestTestCommand.cxx	15 Mar 2006 16:02:08 -0000	1.10
--- cmCTestTestCommand.cxx	2 Dec 2008 12:07:40 -0000	1.10.12.1
***************
*** 25,28 ****
--- 25,30 ----
    this->Arguments[ctt_END] = "END";
    this->Arguments[ctt_STRIDE] = "STRIDE";
+   this->Arguments[ctt_EXCLUDE] = "EXCLUDE";
+   this->Arguments[ctt_INCLUDE] = "INCLUDE";
    this->Arguments[ctt_LAST] = 0;
    this->Last = ctt_LAST;
***************
*** 69,72 ****
--- 71,82 ----
        testsToRunString.str().c_str());
      }
+   if(this->Values[ctt_EXCLUDE])
+     {
+     handler->SetOption("ExcludeRegularExpression", this->Values[ctt_EXCLUDE]);
+     }
+   if(this->Values[ctt_INCLUDE])
+     {
+     handler->SetOption("IncludeRegularExpression", this->Values[ctt_INCLUDE]);
+     }
    return handler;
  }

Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -C 2 -d -r1.43 -r1.43.2.1
*** cmCTestScriptHandler.cxx	23 Jan 2008 15:28:01 -0000	1.43
--- cmCTestScriptHandler.cxx	2 Dec 2008 12:07:40 -0000	1.43.2.1
***************
*** 381,388 ****
--- 381,413 ----
    this->Makefile->AddFunctionBlocker(f);
  
+   /* Execute CMakeDetermineSystem and CMakeSystemSpecificInformation, so 
+   that variables like CMAKE_SYSTEM and also the search paths for libraries,
+   header and executables are set correctly and can be used. Makes new-style
+   ctest scripting easier. */
+   std::string systemFile = 
+       this->Makefile->GetModulesFile("CMakeDetermineSystem.cmake");
+   if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
+       cmSystemTools::GetErrorOccuredFlag())
+     {
+     return 2;
+     }
+ 
+   systemFile = 
+       this->Makefile->GetModulesFile("CMakeSystemSpecificInformation.cmake");
+   if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
+       cmSystemTools::GetErrorOccuredFlag())
+     {
+     cmCTestLog(this->CTest, DEBUG, "Error in read: "  << systemFile.c_str()
+                << std::endl);
+     return 2;
+     }
+ 
    // finally read in the script
    if (!this->Makefile->ReadListFile(0, script.c_str()) ||
      cmSystemTools::GetErrorOccuredFlag())
      {
+     cmCTestLog(this->CTest, DEBUG, "Error in read script: "
+                << script.c_str()
+                << std::endl);
      return 2;
      }