[Cmake-commits] CMake branch, next, updated. v2.8.11-2065-g0e7d67d

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0e7d67d050498d86e33b3914c51d0e9991e59e02 (commit)
       via  60c412ac50c105d536969122f7daf21076226476 (commit)
      from  acc9ada3a959b5a4b17e8bc6952f1c4defb53842 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e7d67d050498d86e33b3914c51d0e9991e59e02
commit 0e7d67d050498d86e33b3914c51d0e9991e59e02
Merge: acc9ada 60c412a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 18 03:54:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 18 03:54:02 2013 -0400

    Merge topic 'ctest-parallel-env' into next
    
    60c412a Add the handling of the CTEST_PARALLEL_LEVEL env var.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60c412ac50c105d536969122f7daf21076226476
commit 60c412ac50c105d536969122f7daf21076226476
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 17 15:26:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 17 15:36:34 2013 +0200

    Add the handling of the CTEST_PARALLEL_LEVEL env var.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 9a042c4..69ffb97 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -294,6 +294,7 @@ cmCTest::cmCTest()
 {
   this->LabelSummary           = true;
   this->ParallelLevel          = 1;
+  this->ParallelLevelSetInCli  = false;
   this->SubmitIndex            = 0;
   this->Failover               = false;
   this->BatchJobs              = false;
@@ -1999,11 +2000,13 @@ void cmCTest::HandleCommandLineArguments(size_t &i,
     i++;
     int plevel = atoi(args[i].c_str());
     this->SetParallelLevel(plevel);
+    this->ParallelLevelSetInCli = true;
     }
   else if(arg.find("-j") == 0)
     {
     int plevel = atoi(arg.substr(2).c_str());
     this->SetParallelLevel(plevel);
+    this->ParallelLevelSetInCli = true;
     }
 
   if(this->CheckArgument(arg, "--no-compress-output"))
@@ -2398,6 +2401,14 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
       }
     } // the close of the for argument loop
 
+  if (!this->ParallelLevelSetInCli)
+    {
+    if (const char *parallel = cmSystemTools::GetEnv("CTEST_PARALLEL_LEVEL"))
+      {
+      int plevel = atoi(parallel);
+      this->SetParallelLevel(plevel);
+      }
+    }
 
   // now what sould cmake do? if --build-and-test was specified then
   // we run the build and test handler and return
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 587a6db..5dd35ce 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -485,6 +485,7 @@ private:
   int                     MaxTestNameWidth;
 
   int                     ParallelLevel;
+  bool                    ParallelLevelSetInCli;
 
   int                     CompatibilityMode;
 
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 285ec17..4b57ec3 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -71,7 +71,8 @@ static const char * cmDocumentationOptions[][3] =
   {"-j <jobs>, --parallel <jobs>", "Run the tests in parallel using the"
    "given number of jobs.",
    "This option tells ctest to run the tests in parallel using given "
-   "number of jobs."},
+   "number of jobs.  This option can also be set by setting "
+   "the environment variable CTEST_PARALLEL_LEVEL"},
   {"-Q,--quiet", "Make ctest quiet.",
     "This option will suppress all the output. The output log file will "
     "still be generated if the --output-log is specified. Options such "

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCTest.cxx |   11 +++++++++++
 Source/cmCTest.h   |    1 +
 Source/ctest.cxx   |    3 ++-
 3 files changed, 14 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake