[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1093-g64d1346

[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  64d1346035c4126296c2a09a8f8250c99feb3bda (commit)
       via  070fe4e6987595d4846940ba272af01c3aeef857 (commit)
      from  502bcaa047397b1e113dd574fdf2ec1e06fda3d4 (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=64d1346035c4126296c2a09a8f8250c99feb3bda
commit 64d1346035c4126296c2a09a8f8250c99feb3bda
Merge: 502bcaa 070fe4e
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jul 15 13:37:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 15 13:37:28 2015 -0400

    Merge topic 'ctest-change-id' into next
    
    070fe4e6 Convert ChangeId into an attribute on the Site tag


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=070fe4e6987595d4846940ba272af01c3aeef857
commit 070fe4e6987595d4846940ba272af01c3aeef857
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jul 15 12:33:46 2015 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Jul 15 12:33:46 2015 -0400

    Convert ChangeId into an attribute on the Site tag
    
    This makes it so ChangeId will be represented in all of the
    CTest generated XML files, not just Build.xml & Test.xml.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 223fe90..6dbb245 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -561,12 +561,6 @@ void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml)
   xml.Element("StartBuildTime",
     static_cast<unsigned int>(this->StartBuildTime));
   xml.Element("BuildCommand", this->GetMakeCommand());
-
-  std::string changeId = this->CTest->GetCTestConfiguration("ChangeId");
-  if(!changeId.empty())
-    {
-    xml.Element("ChangeId", changeId);
-    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index b7ae56e..5faf001 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1175,11 +1175,6 @@ void cmCTestTestHandler::GenerateDartOutput(cmXMLWriter& xml)
   xml.StartElement("Testing");
   xml.Element("StartDateTime", this->StartTest);
   xml.Element("StartTestTime", this->StartTestTime);
-  std::string changeId = this->CTest->GetCTestConfiguration("ChangeId");
-  if(!changeId.empty())
-    {
-    xml.Element("ChangeId", changeId);
-    }
   xml.StartElement("TestList");
   cmCTestTestHandler::TestResultsVector::size_type cc;
   for ( cc = 0; cc < this->TestResults.size(); cc ++ )
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 5676dda..f65bd29 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1567,6 +1567,13 @@ void cmCTest::StartXML(cmXMLWriter& xml, bool append)
   xml.Attribute("LogicalProcessorsPerPhysical",
                      info.GetLogicalProcessorsPerPhysical());
   xml.Attribute("ProcessorClockFrequency", info.GetProcessorClockFrequency());
+
+  std::string changeId = this->GetCTestConfiguration("ChangeId");
+  if(!changeId.empty())
+    {
+    xml.Attribute("ChangeId", changeId);
+    }
+
   this->AddSiteProperties(xml);
 }
 
diff --git a/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake b/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
index 074cc71..074801f 100644
--- a/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
+++ b/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
@@ -1,7 +1,7 @@
 file(GLOB build_xml_file "${RunCMake_TEST_BINARY_DIR}/Testing/*/Build.xml")
 if(build_xml_file)
   file(READ "${build_xml_file}" build_xml LIMIT 4096)
-  if(NOT build_xml MATCHES [[<ChangeId><>1</ChangeId>]])
+  if(NOT build_xml MATCHES [[ChangeId="<>1"]])
     string(REPLACE "\n" "\n  " build_xml "  ${build_xml}")
     set(RunCMake_TEST_FAILED
       "Build.xml does not have expected ChangeId:\n${build_xml}"
diff --git a/Tests/RunCMake/ctest_test/TestChangeId-check.cmake b/Tests/RunCMake/ctest_test/TestChangeId-check.cmake
index 91e9ae4..b9884f1 100644
--- a/Tests/RunCMake/ctest_test/TestChangeId-check.cmake
+++ b/Tests/RunCMake/ctest_test/TestChangeId-check.cmake
@@ -1,7 +1,7 @@
 file(GLOB test_xml_file "${RunCMake_TEST_BINARY_DIR}/Testing/*/Test.xml")
 if(test_xml_file)
   file(READ "${test_xml_file}" test_xml LIMIT 4096)
-  if(NOT test_xml MATCHES [[<ChangeId><>1</ChangeId>]])
+  if(NOT test_xml MATCHES [[ChangeId="<>1"]])
     string(REPLACE "\n" "\n  " test_xml "  ${test_xml}")
     set(RunCMake_TEST_FAILED
       "Test.xml does not have expected ChangeId:\n${test_xml}"

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

Summary of changes:
 Source/CTest/cmCTestBuildHandler.cxx                 |    6 ------
 Source/CTest/cmCTestTestHandler.cxx                  |    5 -----
 Source/cmCTest.cxx                                   |    7 +++++++
 Tests/RunCMake/ctest_build/BuildChangeId-check.cmake |    2 +-
 Tests/RunCMake/ctest_test/TestChangeId-check.cmake   |    2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake