reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-30 15:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'fix_repeat_until_fail_duplicated_output'

Browse Source 
a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail
This commit is contained in:
Brad King 2017-01-16 11:01:02 -05:00 committed by CMake Topic Stage
commit 0f3bb10dbe
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestRunTest.cxx
View File

@ -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;

2
Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
View File

@ -12,4 +12,6 @@ add_test(NAME test1
set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
add_test(hello ${CMAKE_COMMAND} -E echo hello)
set_tests_properties(hello PROPERTIES FAIL_REGULAR_EXPRESSION "hello.*hello")
add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)