summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-16 16:01:02 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-16 16:01:02 (GMT)
commit0f3bb10dbe253ddeabe1b7006b46d813de61dd01 (patch)
tree8331413aef0b1869432d55ed89ef2d7a495f80f3 /Source/CTest
parent2ad405202e811affb9961f96a90d319d49a88b11 (diff)
parenta10586377232b28be13c2bf90c98d002067eb5fc (diff)
downloadCMake-0f3bb10dbe253ddeabe1b7006b46d813de61dd01.zip
CMake-0f3bb10dbe253ddeabe1b7006b46d813de61dd01.tar.gz
CMake-0f3bb10dbe253ddeabe1b7006b46d813de61dd01.tar.bz2
Merge topic 'fix_repeat_until_fail_duplicated_output'
a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestRunTest.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 5c45fe5..ac1644f 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -134,6 +134,7 @@ void cmCTestRunTest::CompressOutput()
size_t rlen = cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1);
+ this->CompressedOutput.clear();
for (size_t i = 0; i < rlen; i++) {
this->CompressedOutput += encoded_buffer[i];
}
@@ -416,6 +417,7 @@ bool cmCTestRunTest::StartTest(size_t total)
<< std::setw(getNumWidth(this->TestHandler->GetMaxIndex()))
<< this->TestProperties->Index << ": "
<< this->TestProperties->Name << std::endl);
+ this->ProcessOutput.clear();
this->ComputeArguments();
std::vector<std::string>& args = this->TestProperties->Args;
this->TestResult.Properties = this->TestProperties;