[Cmake-commits] [cmake-commits] zach.mullen committed cmCTest.cxx 1.381 1.382 cmCTest.h 1.127 1.128 cmSetTestsPropertiesCommand.h 1.16 1.17 ctest.cxx 1.115 1.116

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmCTest.h cmSetTestsPropertiesCommand.h ctest.cxx 
Log Message:
Added an option to conditionally attach files to a test submission only if the test does not pass.  Also some preliminary changes for test output compression.


Index: cmSetTestsPropertiesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSetTestsPropertiesCommand.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** cmSetTestsPropertiesCommand.h	15 Dec 2009 17:07:15 -0000	1.16
--- cmSetTestsPropertiesCommand.h	16 Dec 2009 19:50:16 -0000	1.17
***************
*** 79,83 ****
        "ATTACHED_FILES: Set this property to a list of files that will be "
        "encoded and submitted to the dashboard as an addition to the test "
!       "result.\n";
      }
  
--- 79,85 ----
        "ATTACHED_FILES: Set this property to a list of files that will be "
        "encoded and submitted to the dashboard as an addition to the test "
!       "result.\n"
!       "ATTACHED_FILES_ON_FAIL: Same as ATTACHED_FILES, but these files will "
!       "only be included if the test does not pass.\n";
      }
  

Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -C 2 -d -r1.127 -r1.128
*** cmCTest.h	11 Dec 2009 19:10:37 -0000	1.127
--- cmCTest.h	16 Dec 2009 19:50:16 -0000	1.128
***************
*** 196,199 ****
--- 196,201 ----
    bool ShouldUseHTTP10() { return this->UseHTTP10; }
  
+   bool ShouldCompressTestOutput() { return this->CompressTestOutput; }
+ 
    //Used for parallel ctest job scheduling
    std::string GetScheduleType() { return this->ScheduleType; }
***************
*** 447,450 ****
--- 449,454 ----
    bool                     CompressXMLFiles;
  
+   bool                     CompressTestOutput;
+ 
    void InitStreams();
    std::ostream* StreamOut;

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.381
retrieving revision 1.382
diff -C 2 -d -r1.381 -r1.382
*** cmCTest.cxx	11 Dec 2009 19:10:36 -0000	1.381
--- cmCTest.cxx	16 Dec 2009 19:50:16 -0000	1.382
***************
*** 222,225 ****
--- 222,226 ----
    this->RunConfigurationScript = false;
    this->UseHTTP10              = false;
+   this->CompressTestOutput     = true;
    this->TestModel              = cmCTest::EXPERIMENTAL;
    this->MaxTestNameWidth       = 30;
***************
*** 1706,1709 ****
--- 1707,1715 ----
      }
  
+   if(this->CheckArgument(arg, "--no-compress-output"))
+     {
+     this->CompressTestOutput = false;
+     }
+ 
    if(this->CheckArgument(arg, "--http1.0"))
      {

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.115
retrieving revision 1.116
diff -C 2 -d -r1.115 -r1.116
*** ctest.cxx	11 Dec 2009 19:30:26 -0000	1.115
--- ctest.cxx	16 Dec 2009 19:50:16 -0000	1.116
***************
*** 222,225 ****
--- 222,229 ----
    "This option will force CTest to use HTTP 1.0 to submit files to the "
    "dashboard, instead of HTTP 1.1."},
+   {"--no-compress-output", "Do not compress test output when submitting.",
+    "This flag will turn off automatic compression of test output.  Use this "
+    "to maintain compatibility with an older version of CDash which doesn't "
+    "support compressed test output."},
    {"--help-command <cmd> [<file>]", "Show help for a single command and exit.",
     "Prints the help for the command to stdout or to the specified file." },