[Cmake-commits] CMake branch, next, updated. v3.7.1-2141-g21d0df2

[Brad King]

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  21d0df2c519548c8fe752002e37bc2958f99f4b9 (commit)
       via  a10586377232b28be13c2bf90c98d002067eb5fc (commit)
      from  e568e03e024719c1e119fb5e3ee35f491ca1b757 (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=21d0df2c519548c8fe752002e37bc2958f99f4b9
commit 21d0df2c519548c8fe752002e37bc2958f99f4b9
Merge: e568e03 a105863
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:44:20 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:44:20 2017 -0500

    Merge topic 'fix_repeat_until_fail_duplicated_output' into next
    
    a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a10586377232b28be13c2bf90c98d002067eb5fc
commit a10586377232b28be13c2bf90c98d002067eb5fc
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Thu Jan 12 11:32:58 2017 +0100
Commit:     Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Thu Jan 12 11:32:58 2017 +0100

    CTest: Properly reset output to avoid duplication with --repeat-until-fail

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;
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
index 4654416..ecb9a64 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
@@ -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)

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx                               |    2 ++
 Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake |    2 ++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
CMake