[Cmake-commits] CMake branch, next, updated. v3.1.0-1921-g13da15f

[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  13da15ff0ad34ec35039acfd6a1f3b343f38dc87 (commit)
       via  509f2713bfa0a289851dfd8d6e45a356adf233b7 (commit)
      from  db5583de060221ed7af339eb1a9101d43794f11a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13da15ff0ad34ec35039acfd6a1f3b343f38dc87
commit 13da15ff0ad34ec35039acfd6a1f3b343f38dc87
Merge: db5583d 509f271
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 09:39:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 09:39:31 2015 -0500

    Merge topic 'fix-ctest_build-output-processing-regression' into next
    
    509f2713 ctest_build: Fix logic regression in parent that clips build output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=509f2713bfa0a289851dfd8d6e45a356adf233b7
commit 509f2713bfa0a289851dfd8d6e45a356adf233b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 09:28:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 15 09:32:58 2015 -0500

    ctest_build: Fix logic regression in parent that clips build output
    
    The sweeping pattern change in commit 238dd2fb (Use insert instead of a
    loop in some cases, 2014-11-22) accidentally changed the iterator range
    used on the queue in cmCTestBuildHandler::ProcessBuffer.  Instead of
    ending at the iterator positioned at the next newline to populate
    CurrentProcessingLine, it was changed to go to the end of the queue.
    This causes the line to contain newlines and possibly be cut off in the
    middle of a line.  Fix this regression by restoring use of the proper
    end-of-line position.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 5e7d764..0c3f206 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -1095,7 +1095,7 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
       // Create a contiguous array for the line
       this->CurrentProcessingLine.clear();
       this->CurrentProcessingLine.insert(this->CurrentProcessingLine.end(),
-                                         queue->begin(), queue->end());
+                                         queue->begin(), it);
       this->CurrentProcessingLine.push_back(0);
       const char* line = &*this->CurrentProcessingLine.begin();
 

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

Summary of changes:
 Source/CTest/cmCTestBuildHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake