summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2017-09-06 16:07:08 (GMT)
committerBrad King <brad.king@kitware.com>2017-09-08 14:03:01 (GMT)
commit5b829c89b8cdb5b8f908dcd4849a37a183b0971c (patch)
tree4c0105ce057c91a42a77adac5450408a153d654b /Source/CTest
parenta6e32eb0c26277c71c586aba457df5daaf2a71ba (diff)
downloadCMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.zip
CMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.tar.gz
CMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.tar.bz2
CTest: Weight reported test times by PROCESSORS in summaries
This commit changes the times reported by labels and subprojects to be weighted by the PROCESSORS property. It is reported with `sec*proc` instead of just `sec`.
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 24c1857..9962c49 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -664,7 +664,7 @@ void cmCTestTestHandler::PrintLabelOrSubprojectSummary(bool doSubProject)
l != p.Labels.end(); ++l) {
// only use labels found in labels
if (labels.find(*l) != labels.end()) {
- labelTimes[*l] += result.ExecutionTime;
+ labelTimes[*l] += result.ExecutionTime * result.Properties->Processors;
++labelCounts[*l];
}
}
@@ -687,7 +687,7 @@ void cmCTestTestHandler::PrintLabelOrSubprojectSummary(bool doSubProject)
label.resize(maxlen + 3, ' ');
char buf[1024];
- sprintf(buf, "%6.2f sec", labelTimes[*i]);
+ sprintf(buf, "%6.2f sec*proc", labelTimes[*i]);
std::ostringstream labelCountStr;
labelCountStr << "(" << labelCounts[*i] << " test";