[Cmake-commits] CMake branch, next, updated. v3.2.2-3159-gc7b4f59
Brad King
brad.king at kitware.com
Tue May 26 10:46:55 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 c7b4f59b1917ff01ee43ea651068d5e681d103d7 (commit)
via b26e5b552a53521ba06d27835cac2a6f72d70dfc (commit)
via 965cf8e66e8316f34113c219d9311edee34bfd3b (commit)
from f70d8830781b909e5171e41940fcc60248a60bf9 (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=c7b4f59b1917ff01ee43ea651068d5e681d103d7
commit c7b4f59b1917ff01ee43ea651068d5e681d103d7
Merge: f70d883 b26e5b5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 10:46:54 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 10:46:54 2015 -0400
Merge topic 'ctest-xml-minor-cleanup' into next
b26e5b55 CTest: Generate NamedMeasurement elements directly into xml file
965cf8e6 CTest: Drop stray content from Configure.xml
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b26e5b552a53521ba06d27835cac2a6f72d70dfc
commit b26e5b552a53521ba06d27835cac2a6f72d70dfc
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun May 24 01:00:12 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 10:40:00 2015 -0400
CTest: Generate NamedMeasurement elements directly into xml file
Re-order the logic to avoid use of a temporary std::ostringstream.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index d7da2b4..d9e4bd4 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -607,7 +607,7 @@ void cmCTestRunTest::DartProcessing()
{
if (this->TestHandler->DartStuff.find(this->ProcessOutput.c_str()))
{
- std::string dartString = this->TestHandler->DartStuff.match(1);
+ this->TestResult.DartString = this->TestHandler->DartStuff.match(1);
// keep searching and replacing until none are left
while (this->TestHandler->DartStuff1.find(this->ProcessOutput.c_str()))
{
@@ -615,8 +615,6 @@ void cmCTestRunTest::DartProcessing()
cmSystemTools::ReplaceString(this->ProcessOutput,
this->TestHandler->DartStuff1.match(1).c_str(), "");
}
- this->TestResult.RegressionImages
- = this->TestHandler->GenerateRegressionImages(dartString);
}
}
}
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index b1c479e..aa68461 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1185,7 +1185,7 @@ void cmCTestTestHandler::GenerateDartOutput(std::ostream& os)
<< "</Value></NamedMeasurement>"
<< std::endl;
}
- os << result->RegressionImages;
+ this->GenerateRegressionImages(os, result->DartString);
os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
<< "name=\"Execution Time\"><Value>"
<< result->ExecutionTime
@@ -1828,8 +1828,8 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed()
// Just for convenience
#define SPACE_REGEX "[ \t\r\n]"
//----------------------------------------------------------------------
-std::string cmCTestTestHandler::GenerateRegressionImages(
- const std::string& xml)
+void cmCTestTestHandler::GenerateRegressionImages(
+ std::ostream& ostr, const std::string& xml)
{
cmsys::RegularExpression twoattributes(
"<DartMeasurement"
@@ -1864,7 +1864,6 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
SPACE_REGEX "*>([^<]*)</DartMeasurementFile>");
- std::ostringstream ostr;
bool done = false;
std::string cxml = xml;
while ( ! done )
@@ -2026,7 +2025,6 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
done = true;
}
}
- return ostr.str();
}
//----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index fe43bb8..623c996 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -128,7 +128,7 @@ public:
bool CompressOutput;
std::string CompletionStatus;
std::string Output;
- std::string RegressionImages;
+ std::string DartString;
int TestCount;
cmCTestTestProperties* Properties;
};
@@ -270,7 +270,7 @@ private:
cmsys::RegularExpression IncludeTestsRegularExpression;
cmsys::RegularExpression ExcludeTestsRegularExpression;
- std::string GenerateRegressionImages(const std::string& xml);
+ void GenerateRegressionImages(std::ostream& ostr, const std::string& xml);
cmsys::RegularExpression DartStuff1;
void CheckLabelFilter(cmCTestTestProperties& it);
void CheckLabelFilterExclude(cmCTestTestProperties& it);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=965cf8e66e8316f34113c219d9311edee34bfd3b
commit 965cf8e66e8316f34113c219d9311edee34bfd3b
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat May 23 23:37:59 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 10:39:45 2015 -0400
CTest: Drop stray content from Configure.xml
Remove content left accidentally since commit v2.4.0~2876 (some bug
fixes for my recent checkins and some more cleanup, 2004-09-07).
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 3b444f2..2c2951d 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -95,11 +95,6 @@ int cmCTestConfigureHandler::ProcessHandler()
<< std::endl
<< "\t<StartConfigureTime>" << start_time_time
<< "</StartConfigureTime>\n";
-
- if ( res == cmsysProcess_State_Exited && retVal )
- {
- os << retVal;
- }
os << "<ConfigureCommand>" << cCommand << "</ConfigureCommand>"
<< std::endl;
cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestConfigureHandler.cxx | 5 -----
Source/CTest/cmCTestRunTest.cxx | 4 +---
Source/CTest/cmCTestTestHandler.cxx | 8 +++-----
Source/CTest/cmCTestTestHandler.h | 4 ++--
4 files changed, 6 insertions(+), 15 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list