[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1033-g5e77dc0

[Zack Galbreath]

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  5e77dc0b1a93c9c873a7426a6b231c4303ac622e (commit)
       via  481a1b7d7ef717248487bf8d939310edaf53467e (commit)
      from  e53860733e9868ceb85771e78111c586eac92a0f (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=5e77dc0b1a93c9c873a7426a6b231c4303ac622e
commit 5e77dc0b1a93c9c873a7426a6b231c4303ac622e
Merge: e538607 481a1b7
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Jul 14 11:28:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 14 11:28:30 2015 -0400

    Merge topic 'include_PR_in_XML' into next
    
    481a1b7d new variable: CTEST_PULL_REQUEST


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=481a1b7d7ef717248487bf8d939310edaf53467e
commit 481a1b7d7ef717248487bf8d939310edaf53467e
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Jul 7 21:50:32 2015 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Jul 14 11:27:55 2015 -0400

    new variable: CTEST_PULL_REQUEST
    
    This allows CDash to post comments on your pull request
    if anything goes wrong with your build.

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index f54436a..46188b5 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -381,6 +381,7 @@ Variables for CTest
    /variable/CTEST_P4_COMMAND
    /variable/CTEST_P4_OPTIONS
    /variable/CTEST_P4_UPDATE_OPTIONS
+   /variable/CTEST_PULL_REQUEST
    /variable/CTEST_SCP_COMMAND
    /variable/CTEST_SITE
    /variable/CTEST_SOURCE_DIRECTORY
diff --git a/Help/variable/CTEST_PULL_REQUEST.rst b/Help/variable/CTEST_PULL_REQUEST.rst
new file mode 100644
index 0000000..eb2a7c8
--- /dev/null
+++ b/Help/variable/CTEST_PULL_REQUEST.rst
@@ -0,0 +1,8 @@
+CTEST_PULL_REQUEST
+------------------
+
+Specify the CTest ``PullRequest`` setting
+in a :manual:`ctest(1)` dashboard client script.
+
+This setting allows CDash to post comments on your pull request
+if anything goes wrong with your build.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 6dbb245..6597cb8 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -561,6 +561,12 @@ void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml)
   xml.Element("StartBuildTime",
     static_cast<unsigned int>(this->StartBuildTime));
   xml.Element("BuildCommand", this->GetMakeCommand());
+
+  std::string pullRequest = this->CTest->GetCTestConfiguration("PullRequest");
+  if(!pullRequest.empty())
+    {
+    xml.Element("PullRequest", pullRequest);
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 3003e8a..d18ec71 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -109,6 +109,13 @@ bool cmCTestHandlerCommand
       this->Quiet);
     }
 
+  if(const char* pullRequest =
+     this->Makefile->GetDefinition("CTEST_PULL_REQUEST"))
+    {
+    this->CTest->SetCTestConfiguration("PullRequest", pullRequest,
+      this->Quiet);
+    }
+
   cmCTestLog(this->CTest, DEBUG, "Initialize handler" << std::endl;);
   cmCTestGenericHandler* handler = this->InitializeHandler();
   if ( !handler )
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 5faf001..4723a5f 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1175,6 +1175,11 @@ void cmCTestTestHandler::GenerateDartOutput(cmXMLWriter& xml)
   xml.StartElement("Testing");
   xml.Element("StartDateTime", this->StartTest);
   xml.Element("StartTestTime", this->StartTestTime);
+  std::string pullRequest = this->CTest->GetCTestConfiguration("PullRequest");
+  if(!pullRequest.empty())
+    {
+    xml.Element("PullRequest", pullRequest);
+    }
   xml.StartElement("TestList");
   cmCTestTestHandler::TestResultsVector::size_type cc;
   for ( cc = 0; cc < this->TestResults.size(); cc ++ )

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

Summary of changes:
 Help/manual/cmake-variables.7.rst      |    1 +
 Help/variable/CTEST_PULL_REQUEST.rst   |    8 ++++++++
 Source/CTest/cmCTestBuildHandler.cxx   |    6 ++++++
 Source/CTest/cmCTestHandlerCommand.cxx |    7 +++++++
 Source/CTest/cmCTestTestHandler.cxx    |    5 +++++
 5 files changed, 27 insertions(+)
 create mode 100644 Help/variable/CTEST_PULL_REQUEST.rst


hooks/post-receive
-- 
CMake