[Cmake-commits] CMake branch, next, updated. v3.7.0-1162-g33eadfa
Brad King
brad.king at kitware.com
Tue Nov 15 09:55:48 EST 2016
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 33eadfabaf1a91a0800d9be79104b208023ebda0 (commit)
via 0114d0c0ec0e8b4b1b7eab94ea8b7a5cefbecf99 (commit)
from bded33556f7b3680021b3db6f0757a8a71566a95 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33eadfabaf1a91a0800d9be79104b208023ebda0
commit 33eadfabaf1a91a0800d9be79104b208023ebda0
Merge: bded335 0114d0c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 09:55:47 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 09:55:47 2016 -0500
Merge topic 'improve_ctest_memcheck_output' into next
0114d0c0 Revert "ctest: Improve output for `-T MemCheck`"
diff --cc Source/CTest/cmCTestMemCheckHandler.cxx
index 2c31f60,0052a16..0f27fac
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@@ -358,18 -352,9 +358,9 @@@ void cmCTestMemCheckHandler::GenerateDa
this->GlobalResults[kk] += memcheckresults[kk];
}
xml.EndElement(); // Results
- if (memoryErrors > 0) {
- const int maxTestNameWidth = this->CTest->GetMaxTestNameWidth();
- std::string outname = result->Name + " ";
- outname.resize(maxTestNameWidth + 4, '.');
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, cc + 1
- << "/" << total << " MemCheck: #"
- << result->TestCount << ": " << outname
- << " Defects: " << memoryErrors << std::endl,
- this->Quiet);
- }
+
xml.StartElement("Log");
- if (this->CTest->ShouldCompressMemCheckOutput()) {
+ if (this->CTest->ShouldCompressTestOutput()) {
this->CTest->CompressString(memcheckstr);
xml.Attribute("compression", "gzip");
xml.Attribute("encoding", "base64");
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0114d0c0ec0e8b4b1b7eab94ea8b7a5cefbecf99
commit 0114d0c0ec0e8b4b1b7eab94ea8b7a5cefbecf99
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 09:55:26 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 15 09:55:26 2016 -0500
Revert "ctest: Improve output for `-T MemCheck`"
This reverts commit 797bc54afe2a84b232d3886b1c977cd3b876057e.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 233bfdb..0052a16 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -323,8 +323,10 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
}
xml.EndElement(); // TestList
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- "-- Processing memory checking output:\n", this->Quiet);
+ "-- Processing memory checking output: ", this->Quiet);
size_t total = this->TestResults.size();
+ size_t step = total / 10;
+ size_t current = 0;
for (cc = 0; cc < this->TestResults.size(); cc++) {
cmCTestTestResult* result = &this->TestResults[cc];
std::string memcheckstr;
@@ -339,29 +341,18 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
static_cast<size_t>(this->CustomMaximumFailedTestOutputSize));
this->WriteTestResultHeader(xml, result);
xml.StartElement("Results");
- int memoryErrors = 0;
for (std::vector<int>::size_type kk = 0; kk < memcheckresults.size();
++kk) {
if (memcheckresults[kk]) {
xml.StartElement("Defect");
xml.Attribute("type", this->ResultStringsLong[kk]);
xml.Content(memcheckresults[kk]);
- memoryErrors += memcheckresults[kk];
xml.EndElement(); // Defect
}
this->GlobalResults[kk] += memcheckresults[kk];
}
xml.EndElement(); // Results
- if (memoryErrors > 0) {
- const int maxTestNameWidth = this->CTest->GetMaxTestNameWidth();
- std::string outname = result->Name + " ";
- outname.resize(maxTestNameWidth + 4, '.');
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, cc + 1
- << "/" << total << " MemCheck: #"
- << result->TestCount << ": " << outname
- << " Defects: " << memoryErrors << std::endl,
- this->Quiet);
- }
+
xml.StartElement("Log");
if (this->CTest->ShouldCompressMemCheckOutput()) {
this->CTest->CompressString(memcheckstr);
@@ -372,16 +363,13 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
xml.EndElement(); // Log
this->WriteTestResultFooter(xml, result);
+ if (current < cc) {
+ cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush,
+ this->Quiet);
+ current += step;
+ }
}
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- "MemCheck log files can be found here: "
- "( * corresponds to test number)"
- << std::endl,
- this->Quiet);
- std::string output = this->MemoryTesterOutputFile;
- cmSystemTools::ReplaceString(output, "??", "*");
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, output << std::endl,
- this->Quiet);
+ cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
"Memory checking results:" << std::endl, this->Quiet);
xml.StartElement("DefectList");
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
index 69ab584..dabb004 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
@@ -2,7 +2,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt
index 69ab584..dabb004 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt
@@ -2,7 +2,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt
index 69ab584..dabb004 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt
@@ -2,7 +2,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt
index 69ab584..dabb004 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt
@@ -2,7 +2,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt
index 88b4788..5a5675c 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt
@@ -3,7 +3,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt
index 69ab584..dabb004 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt
@@ -2,7 +2,5 @@
100% tests passed, 0 tests failed out of 1
.*
--- Processing memory checking output:
-MemCheck log files can be found here:.*corresponds to test number.
-.*MemoryChecker.*log
+-- Processing memory checking output:( )
Memory checking results:
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestMemCheckHandler.cxx | 32 ++++++--------------
.../RunCMake/ctest_memcheck/DummyPurify-stdout.txt | 4 +--
.../ctest_memcheck/DummyValgrind-stdout.txt | 4 +--
.../DummyValgrindCustomOptions-stdout.txt | 4 +--
.../DummyValgrindFailPost-stdout.txt | 4 +--
.../DummyValgrindIgnoreMemcheck-stdout.txt | 4 +--
.../ctest_memcheck/DummyValgrindPrePost-stdout.txt | 4 +--
7 files changed, 16 insertions(+), 40 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list