[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1054-g071482f
Brad King
brad.king at kitware.com
Wed Jul 15 08:53:08 EDT 2015
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 071482f9956ae5f6eb8daa3562c6e826d3637ca9 (commit)
via 0f5b0d4716529430e524bd753b9b68b29330a8ba (commit)
from 009b92e3f83522d3256594a34e342d20915383e3 (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=071482f9956ae5f6eb8daa3562c6e826d3637ca9
commit 071482f9956ae5f6eb8daa3562c6e826d3637ca9
Merge: 009b92e 0f5b0d4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 08:53:06 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 15 08:53:06 2015 -0400
Merge topic 'include_PR_in_XML' into next
0f5b0d47 fixup! rename CTEST_PULL_REQUEST to CTEST_CHANGE_ID
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5b0d4716529430e524bd753b9b68b29330a8ba
commit 0f5b0d4716529430e524bd753b9b68b29330a8ba
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 08:37:18 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 15 08:52:43 2015 -0400
fixup! rename CTEST_PULL_REQUEST to CTEST_CHANGE_ID
diff --git a/Help/variable/CTEST_CHANGE_ID.rst b/Help/variable/CTEST_CHANGE_ID.rst
index bdbc8c8..a423f49 100644
--- a/Help/variable/CTEST_CHANGE_ID.rst
+++ b/Help/variable/CTEST_CHANGE_ID.rst
@@ -1,7 +1,7 @@
CTEST_CHANGE_ID
---------------
-Specify the CTest ``ChangeID`` setting
+Specify the CTest ``ChangeId`` setting
in a :manual:`ctest(1)` dashboard client script.
This setting allows CTest to pass arbitrary information about this
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 31145c0..223fe90 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -562,11 +562,10 @@ void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml)
static_cast<unsigned int>(this->StartBuildTime));
xml.Element("BuildCommand", this->GetMakeCommand());
- std::string changeID =
- cmXMLSafe(this->CTest->GetCTestConfiguration("ChangeID")).str();
- if(!changeID.empty())
+ std::string changeId = this->CTest->GetCTestConfiguration("ChangeId");
+ if(!changeId.empty())
{
- xml.Element("ChangeID", changeID);
+ xml.Element("ChangeId", changeId);
}
}
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 65c46f4..3579aee 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -109,10 +109,10 @@ bool cmCTestHandlerCommand
this->Quiet);
}
- if(const char* changeID =
+ if(const char* changeId =
this->Makefile->GetDefinition("CTEST_CHANGE_ID"))
{
- this->CTest->SetCTestConfiguration("ChangeID", changeID, this->Quiet);
+ this->CTest->SetCTestConfiguration("ChangeId", changeId, this->Quiet);
}
cmCTestLog(this->CTest, DEBUG, "Initialize handler" << std::endl;);
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index e188a9a..b7ae56e 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1175,11 +1175,10 @@ void cmCTestTestHandler::GenerateDartOutput(cmXMLWriter& xml)
xml.StartElement("Testing");
xml.Element("StartDateTime", this->StartTest);
xml.Element("StartTestTime", this->StartTestTime);
- std::string changeID =
- cmXMLSafe(this->CTest->GetCTestConfiguration("ChangeID")).str();
- if(!changeID.empty())
+ std::string changeId = this->CTest->GetCTestConfiguration("ChangeId");
+ if(!changeId.empty())
{
- xml.Element("ChangeID", changeID);
+ xml.Element("ChangeId", changeId);
}
xml.StartElement("TestList");
cmCTestTestHandler::TestResultsVector::size_type cc;
diff --git a/Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt b/Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt
deleted file mode 100644
index c068b27..0000000
--- a/Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-expected ChangeID found
diff --git a/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake b/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
new file mode 100644
index 0000000..074cc71
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
@@ -0,0 +1,12 @@
+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>]])
+ string(REPLACE "\n" "\n " build_xml " ${build_xml}")
+ set(RunCMake_TEST_FAILED
+ "Build.xml does not have expected ChangeId:\n${build_xml}"
+ )
+ endif()
+else()
+ set(RunCMake_TEST_FAILED "Build.xml not found")
+endif()
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index b3e8729..cc9e0c4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -33,23 +33,11 @@ endfunction()
run_BuildFailure()
-function(run_BuildChangeID)
+function(run_BuildChangeId)
set(CASE_TEST_PREFIX_CODE [[
set(CTEST_CHANGE_ID "<>1")
]])
- set(CASE_TEST_SUFFIX_CODE [[
-file(GLOB_RECURSE build_xml_file
- "${CTEST_BINARY_DIRECTORY}/Testing/Build.xml")
-if(build_xml_file)
- file(STRINGS "${build_xml_file}" line
- REGEX "^.*<ChangeID>(.*)</ChangeID>$" LIMIT_COUNT 1)
- if("${line}" MATCHES "<ChangeID>&\\\;lt\\\;&\\\;gt\\\;1</ChangeID>")
- message("expected ChangeID found")
- endif()
-endif()
-]])
-
- run_ctest(BuildChangeID)
+ run_ctest(BuildChangeId)
endfunction()
-run_BuildChangeID()
+run_BuildChangeId()
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index b04431f..76dc143 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -51,23 +51,11 @@ run_ctest_test(TestLoadOrder TEST_LOAD "ERR4")
unset(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING})
unset(CASE_CTEST_TEST_LOAD)
-function(run_TestChangeID)
+function(run_TestChangeId)
set(CASE_TEST_PREFIX_CODE [[
set(CTEST_CHANGE_ID "<>1")
]])
- set(CASE_TEST_SUFFIX_CODE [[
-file(GLOB_RECURSE test_xml_file
- "${CTEST_BINARY_DIRECTORY}/Testing/Test.xml")
-if(test_xml_file)
- file(STRINGS "${test_xml_file}" line
- REGEX "^.*<ChangeID>(.*)</ChangeID>$" LIMIT_COUNT 1)
- if("${line}" MATCHES "<ChangeID>&\\\;lt\\\;&\\\;gt\\\;1</ChangeID>")
- message("expected ChangeID found")
- endif()
-endif()
-]])
-
- run_ctest(TestChangeID)
+ run_ctest(TestChangeId)
endfunction()
-run_TestChangeID()
+run_TestChangeId()
diff --git a/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt b/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
deleted file mode 100644
index c068b27..0000000
--- a/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-expected ChangeID found
diff --git a/Tests/RunCMake/ctest_test/TestChangeId-check.cmake b/Tests/RunCMake/ctest_test/TestChangeId-check.cmake
new file mode 100644
index 0000000..91e9ae4
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestChangeId-check.cmake
@@ -0,0 +1,12 @@
+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>]])
+ string(REPLACE "\n" "\n " test_xml " ${test_xml}")
+ set(RunCMake_TEST_FAILED
+ "Test.xml does not have expected ChangeId:\n${test_xml}"
+ )
+ endif()
+else()
+ set(RunCMake_TEST_FAILED "Test.xml not found")
+endif()
-----------------------------------------------------------------------
Summary of changes:
Help/variable/CTEST_CHANGE_ID.rst | 2 +-
Source/CTest/cmCTestBuildHandler.cxx | 7 +++----
Source/CTest/cmCTestHandlerCommand.cxx | 4 ++--
Source/CTest/cmCTestTestHandler.cxx | 7 +++----
Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt | 1 -
Tests/RunCMake/ctest_build/BuildChangeId-check.cmake | 12 ++++++++++++
Tests/RunCMake/ctest_build/RunCMakeTest.cmake | 18 +++---------------
Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 18 +++---------------
Tests/RunCMake/ctest_test/TestChangeID-stderr.txt | 1 -
Tests/RunCMake/ctest_test/TestChangeId-check.cmake | 12 ++++++++++++
10 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt
create mode 100644 Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
delete mode 100644 Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
create mode 100644 Tests/RunCMake/ctest_test/TestChangeId-check.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list