[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-306-gb77501d

[Kitware Robot]

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, master has been updated
       via  b77501d4c7341337174f29cae623d8e1905af29a (commit)
       via  ec2f901202fd2907b84ad5f0280a347a8bd9f751 (commit)
      from  ac38bb3aa633c8abf01b3ddad003afd5664c3410 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b77501d4c7341337174f29cae623d8e1905af29a
commit b77501d4c7341337174f29cae623d8e1905af29a
Merge: ac38bb3 ec2f901
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 13 14:56:40 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 13 09:56:46 2017 -0500

    Merge topic 'ctest-warning'
    
    ec2f9012 CTest: correct misleading warning message for RUN_SERIAL tests
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Reviewed-by: Zack Galbreath <zack.galbreath at kitware.com>
    Merge-request: !1469


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec2f901202fd2907b84ad5f0280a347a8bd9f751
commit ec2f901202fd2907b84ad5f0280a347a8bd9f751
Author:     Wouter Klouwen <wouter.klouwen at youview.com>
AuthorDate: Thu Nov 9 13:31:07 2017 +0000
Commit:     Wouter Klouwen <wouter.klouwen at youview.com>
CommitDate: Thu Nov 9 13:53:50 2017 +0000

    CTest: correct misleading warning message for RUN_SERIAL tests
    
    As reported in issue 17167, when only RUN_SERIAL tests remain, CTest can
    display a misleading message that it is waiting for the load to come
    down when in fact, it cannot start any new tests.
    
    This commit fixes that by determining whether this circumstance is
    what's happening and adds an additional warning message in this case.

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 6a7bdc0..ae07feb 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -326,10 +326,22 @@ void cmCTestMultiProcessHandler::StartNextTests()
   }
 
   if (allTestsFailedTestLoadCheck) {
+    // Find out whether there are any non RUN_SERIAL tests left, so that the
+    // correct warning may be displayed.
+    bool onlyRunSerialTestsLeft = true;
+    for (auto const& test : copy) {
+      if (!this->Properties[test]->RunSerial) {
+        onlyRunSerialTestsLeft = false;
+      }
+    }
     cmCTestLog(this->CTest, HANDLER_OUTPUT, "***** WAITING, ");
+
     if (this->SerialTestRunning) {
       cmCTestLog(this->CTest, HANDLER_OUTPUT,
                  "Waiting for RUN_SERIAL test to finish.");
+    } else if (onlyRunSerialTestsLeft) {
+      cmCTestLog(this->CTest, HANDLER_OUTPUT,
+                 "Only RUN_SERIAL tests remain, awaiting available slot.");
     } else {
       /* clang-format off */
       cmCTestLog(this->CTest, HANDLER_OUTPUT,

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)


hooks/post-receive
-- 
CMake