[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1035-gdcfd16c
Zack Galbreath
zack.galbreath at kitware.com
Tue Jul 14 13:00:57 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 dcfd16c0c135215196781245b1456f186441ebe0 (commit)
via 7a6a8e96914bd206a714755c35d2a1368d0acd3d (commit)
from 5e77dc0b1a93c9c873a7426a6b231c4303ac622e (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=dcfd16c0c135215196781245b1456f186441ebe0
commit dcfd16c0c135215196781245b1456f186441ebe0
Merge: 5e77dc0 7a6a8e9
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Jul 14 13:00:56 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 14 13:00:56 2015 -0400
Merge topic 'include_PR_in_XML' into next
7a6a8e96 rename CTEST_PULL_REQUEST to CTEST_CHANGE_ID
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6a8e96914bd206a714755c35d2a1368d0acd3d
commit 7a6a8e96914bd206a714755c35d2a1368d0acd3d
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Jul 14 12:57:40 2015 -0400
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Jul 14 12:57:40 2015 -0400
rename CTEST_PULL_REQUEST to CTEST_CHANGE_ID
Update documentation & add tests to ensure that this value is
being correctly escaped & included in the relevant XML files.
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 46188b5..19d0c68 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -351,6 +351,7 @@ Variables for CTest
/variable/CTEST_BUILD_NAME
/variable/CTEST_BZR_COMMAND
/variable/CTEST_BZR_UPDATE_OPTIONS
+ /variable/CTEST_CHANGE_ID
/variable/CTEST_CHECKOUT_COMMAND
/variable/CTEST_CONFIGURATION_TYPE
/variable/CTEST_CONFIGURE_COMMAND
@@ -381,7 +382,6 @@ 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_CHANGE_ID.rst b/Help/variable/CTEST_CHANGE_ID.rst
new file mode 100644
index 0000000..bdbc8c8
--- /dev/null
+++ b/Help/variable/CTEST_CHANGE_ID.rst
@@ -0,0 +1,9 @@
+CTEST_CHANGE_ID
+---------------
+
+Specify the CTest ``ChangeID`` setting
+in a :manual:`ctest(1)` dashboard client script.
+
+This setting allows CTest to pass arbitrary information about this
+build up to CDash. One use of this feature is to allow CDash to
+post comments on your pull request if anything goes wrong with your build.
diff --git a/Help/variable/CTEST_PULL_REQUEST.rst b/Help/variable/CTEST_PULL_REQUEST.rst
deleted file mode 100644
index eb2a7c8..0000000
--- a/Help/variable/CTEST_PULL_REQUEST.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-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 6597cb8..31145c0 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -562,10 +562,11 @@ void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml)
static_cast<unsigned int>(this->StartBuildTime));
xml.Element("BuildCommand", this->GetMakeCommand());
- std::string pullRequest = this->CTest->GetCTestConfiguration("PullRequest");
- if(!pullRequest.empty())
+ std::string changeID =
+ cmXMLSafe(this->CTest->GetCTestConfiguration("ChangeID")).str();
+ if(!changeID.empty())
{
- xml.Element("PullRequest", pullRequest);
+ xml.Element("ChangeID", changeID);
}
}
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index d18ec71..65c46f4 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -109,11 +109,10 @@ bool cmCTestHandlerCommand
this->Quiet);
}
- if(const char* pullRequest =
- this->Makefile->GetDefinition("CTEST_PULL_REQUEST"))
+ if(const char* changeID =
+ this->Makefile->GetDefinition("CTEST_CHANGE_ID"))
{
- this->CTest->SetCTestConfiguration("PullRequest", pullRequest,
- 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 4723a5f..e188a9a 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1175,10 +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())
+ std::string changeID =
+ cmXMLSafe(this->CTest->GetCTestConfiguration("ChangeID")).str();
+ if(!changeID.empty())
{
- xml.Element("PullRequest", pullRequest);
+ 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
new file mode 100644
index 0000000..c068b27
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt
@@ -0,0 +1 @@
+expected ChangeID found
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index c6f732c..b3e8729 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -31,3 +31,25 @@ endif()
endif()
endfunction()
run_BuildFailure()
+
+
+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)
+endfunction()
+run_BuildChangeID()
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index 21d0447..b04431f 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -49,3 +49,25 @@ set(CASE_CTEST_TEST_LOAD "ERR3")
run_ctest_test(TestLoadOrder TEST_LOAD "ERR4")
unset(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING})
+unset(CASE_CTEST_TEST_LOAD)
+
+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)
+endfunction()
+run_TestChangeID()
diff --git a/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt b/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
new file mode 100644
index 0000000..c068b27
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
@@ -0,0 +1 @@
+expected ChangeID found
diff --git a/Tests/RunCMake/ctest_test/test.cmake.in b/Tests/RunCMake/ctest_test/test.cmake.in
index a8de6a3..2d20595 100644
--- a/Tests/RunCMake/ctest_test/test.cmake.in
+++ b/Tests/RunCMake/ctest_test/test.cmake.in
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.1)
+ at CASE_TEST_PREFIX_CODE@
set(CTEST_SITE "test-site")
set(CTEST_BUILD_NAME "test-build-name")
@@ -15,3 +16,4 @@ ctest_start(Experimental)
ctest_configure()
ctest_build()
ctest_test(${ctest_test_args})
+ at CASE_TEST_SUFFIX_CODE@
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 2 +-
Help/variable/CTEST_CHANGE_ID.rst | 9 ++++++++
Help/variable/CTEST_PULL_REQUEST.rst | 8 -------
Source/CTest/cmCTestBuildHandler.cxx | 7 ++++---
Source/CTest/cmCTestHandlerCommand.cxx | 7 +++----
Source/CTest/cmCTestTestHandler.cxx | 7 ++++---
.../RunCMake/ctest_build/BuildChangeID-stderr.txt | 1 +
Tests/RunCMake/ctest_build/RunCMakeTest.cmake | 22 ++++++++++++++++++++
Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 22 ++++++++++++++++++++
Tests/RunCMake/ctest_test/TestChangeID-stderr.txt | 1 +
Tests/RunCMake/ctest_test/test.cmake.in | 2 ++
11 files changed, 69 insertions(+), 19 deletions(-)
create mode 100644 Help/variable/CTEST_CHANGE_ID.rst
delete mode 100644 Help/variable/CTEST_PULL_REQUEST.rst
create mode 100644 Tests/RunCMake/ctest_build/BuildChangeID-stderr.txt
create mode 100644 Tests/RunCMake/ctest_test/TestChangeID-stderr.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list