[Cmake-commits] [cmake-commits] hoffman committed cmCTest.cxx 1.367 1.368 cmCTest.h 1.120 1.121 ctest.cxx 1.107 1.108

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmCTest.h ctest.cxx 
Log Message:
Add label summary times to ctest default output.  Also, remove parallel time output.  Add flag to disable label summary.


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -C 2 -d -r1.120 -r1.121
*** cmCTest.h	2 Sep 2009 14:08:40 -0000	1.120
--- cmCTest.h	11 Sep 2009 17:34:35 -0000	1.121
***************
*** 377,380 ****
--- 377,381 ----
      { this->StreamOut = out; this->StreamErr = err; }
    void AddSiteProperties(std::ostream& );
+   bool GetLabelSummary() { return this->LabelSummary;}
  private:
    std::string ConfigType;
***************
*** 382,385 ****
--- 383,387 ----
    bool ExtraVerbose;
    bool ProduceXML;
+   bool LabelSummary;
  
    bool Failover;

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.367
retrieving revision 1.368
diff -C 2 -d -r1.367 -r1.368
*** cmCTest.cxx	2 Sep 2009 14:08:39 -0000	1.367
--- cmCTest.cxx	11 Sep 2009 17:34:35 -0000	1.368
***************
*** 209,212 ****
--- 209,213 ----
  cmCTest::cmCTest()
  {
+   this->LabelSummary           = true;
    this->ParallelLevel          = 1;
    this->SubmitIndex            = 0;
***************
*** 1739,1742 ****
--- 1740,1747 ----
      this->ShowLineNumbers = true;
      }
+   if(this->CheckArgument(arg, "--no-label-summary"))
+     {
+     this->LabelSummary = false;
+     }
    if(this->CheckArgument(arg, "-Q", "--quiet"))
      {

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.107
retrieving revision 1.108
diff -C 2 -d -r1.107 -r1.108
*** ctest.cxx	27 Aug 2009 14:37:30 -0000	1.107
--- ctest.cxx	11 Sep 2009 17:34:35 -0000	1.108
***************
*** 157,160 ****
--- 157,164 ----
     "popups and interactive "
     "debugging."},
+   {"--no-label-summary", "Disable timing summary information for labels.",
+    "This option tells ctest to not print summary information for each label "
+    "associated with the tests run. If there are no labels on the "
+    "tests, nothing extra is printed."},
    {"--build-and-test", "Configure, build and run a test.",
     "This option tells ctest to configure (i.e. run cmake on), build, and or "