[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestMultiProcessHandler.cxx 1.13 1.14 cmCTestTestCommand.h 1.12 1.13 cmCTestTestHandler.cxx 1.113 1.114 cmCTestTestHandler.h 1.45 1.46

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestMultiProcessHandler.cxx cmCTestTestCommand.h 
	cmCTestTestHandler.cxx cmCTestTestHandler.h 
Log Message:
Fixed warnings


Index: cmCTestTestCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCTestTestCommand.h	2 Sep 2009 16:35:41 -0000	1.12
--- cmCTestTestCommand.h	3 Sep 2009 15:14:10 -0000	1.13
***************
*** 67,71 ****
        "             [EXCLUDE_LABEL exclude regex] \n"
        "             [INCLUDE_LABEL label regex] \n"
!       "             [PARALLEL_LEVEL level] )\n"
        "Tests the given build directory and stores results in Test.xml. The "
        "second argument is a variable that will hold value. Optionally, "
--- 67,71 ----
        "             [EXCLUDE_LABEL exclude regex] \n"
        "             [INCLUDE_LABEL label regex] \n"
!       "             [PARALLEL_LEVEL level]) \n"
        "Tests the given build directory and stores results in Test.xml. The "
        "second argument is a variable that will hold value. Optionally, "

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.113
retrieving revision 1.114
diff -C 2 -d -r1.113 -r1.114
*** cmCTestTestHandler.cxx	3 Sep 2009 14:47:14 -0000	1.113
--- cmCTestTestHandler.cxx	3 Sep 2009 15:14:12 -0000	1.114
***************
*** 1970,1973 ****
--- 1970,1977 ----
              rtit->Timeout = atof(val.c_str());
              }
+           if ( key == "EXPENSIVE" )
+             {
+             rtit->Expensive = cmSystemTools::IsOn(val.c_str());
+             }
            if ( key == "FAIL_REGULAR_EXPRESSION" )
              {
***************
*** 2117,2120 ****
--- 2121,2125 ----
    test.IsInBasedOnREOptions = true;
    test.WillFail = false;
+   test.Expensive = false;
    test.Timeout = 0;
    test.Processors = 1;

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C 2 -d -r1.45 -r1.46
*** cmCTestTestHandler.h	3 Sep 2009 14:47:14 -0000	1.45
--- cmCTestTestHandler.h	3 Sep 2009 15:14:12 -0000	1.46
***************
*** 97,100 ****
--- 97,101 ----
      bool IsInBasedOnREOptions;
      bool WillFail;
+     bool Expensive;
      double Timeout;
      int Index;

Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** cmCTestMultiProcessHandler.cxx	3 Sep 2009 14:47:14 -0000	1.13
--- cmCTestMultiProcessHandler.cxx	3 Sep 2009 15:14:08 -0000	1.14
***************
*** 162,166 ****
        i !=  tests.end(); ++i)
      {
!     int processors = this->Properties[i->first]->Processors;
      
  //    if(processors > )
--- 162,166 ----
        i !=  tests.end(); ++i)
      {
!     //int processors = this->Properties[i->first]->Processors;
      
  //    if(processors > )