[Cmake-commits] [cmake-commits] hoffman committed ctest.cxx 1.102 1.103 cmCTest.h 1.101 1.102 cmCTest.cxx 1.337 1.338

[cmake-commits at cmake.org]

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

Modified Files:
	ctest.cxx cmCTest.h cmCTest.cxx 
Log Message:
ENH: add max width option to ctest ouptut


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -C 2 -d -r1.101 -r1.102
*** cmCTest.h	3 Jul 2008 13:31:29 -0000	1.101
--- cmCTest.h	22 Sep 2008 18:04:12 -0000	1.102
***************
*** 169,173 ****
    bool GetShowOnly();
  
!    /**
     * Run a single executable command and put the stdout and stderr
     * in output.
--- 169,177 ----
    bool GetShowOnly();
  
! 
!   ///! The max output width
!   int GetMaxTestNameWidth() const;
! 
!   /**
     * Run a single executable command and put the stdout and stderr
     * in output.
***************
*** 374,377 ****
--- 378,383 ----
    double                  TimeOut;
  
+   int                     MaxTestNameWidth;
+ 
    std::string             ParallelCacheFile;
    int                     ParallelLevel;

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.337
retrieving revision 1.338
diff -C 2 -d -r1.337 -r1.338
*** cmCTest.cxx	15 Sep 2008 21:53:27 -0000	1.337
--- cmCTest.cxx	22 Sep 2008 18:04:12 -0000	1.338
***************
*** 250,253 ****
--- 250,254 ----
    this->RunConfigurationScript = false;
    this->TestModel              = cmCTest::EXPERIMENTAL;
+   this->MaxTestNameWidth       = 30;
    this->InteractiveDebugMode   = true;
    this->TimeOut                = 0;
***************
*** 1722,1725 ****
--- 1723,1731 ----
      this->ForceNewCTestProcess = true;
      }
+   if(this->CheckArgument(arg, "-W", "--max-width") && i < args.size() - 1)
+     {
+     i++;
+     this->MaxTestNameWidth = atoi(args[i].c_str());
+     }
    if(this->CheckArgument(arg, "--interactive-debug-mode") &&
       i < args.size() - 1 )
***************
*** 2311,2314 ****
--- 2317,2326 ----
  
  //----------------------------------------------------------------------
+ int cmCTest::GetMaxTestNameWidth() const
+ {
+   return this->MaxTestNameWidth;
+ }
+ 
+ //----------------------------------------------------------------------
  void cmCTest::SetProduceXML(bool v)
  {

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.102
retrieving revision 1.103
diff -C 2 -d -r1.102 -r1.103
*** ctest.cxx	31 Jan 2008 16:43:44 -0000	1.102
--- ctest.cxx	22 Sep 2008 18:04:12 -0000	1.103
***************
*** 129,134 ****
     "When both -R and -I are specified by default the intersection of "
     "tests are run. By specifying -U the union of tests is run instead."},
    {"--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1.",
- 
     "This option causes ctest to run tests in either an interactive mode or "
     "a non-interactive mode. On Windows this means that in non-interactive "
--- 129,137 ----
     "When both -R and -I are specified by default the intersection of "
     "tests are run. By specifying -U the union of tests is run instead."},
+   {"--max-width <width>", "Set the max width for a test name to output",
+    "Set the maximum width for each test name to show in the output.  This "
+    "allows the user to widen the output to avoid cliping the test name which "
+    "can be very annoying."},
    {"--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1.",
     "This option causes ctest to run tests in either an interactive mode or "
     "a non-interactive mode. On Windows this means that in non-interactive "