diff options
author | Brad King <brad.king@kitware.com> | 2015-01-15 14:28:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-01-15 14:32:58 (GMT) |
commit | 509f2713bfa0a289851dfd8d6e45a356adf233b7 (patch) | |
tree | 4471141eac164999a2377618dbd2769814d5f510 /Source/CTest/cmCTestBuildHandler.cxx | |
parent | 238dd2fbab1bd4fb53a25dcd07c1ee41da46d451 (diff) | |
download | CMake-509f2713bfa0a289851dfd8d6e45a356adf233b7.zip CMake-509f2713bfa0a289851dfd8d6e45a356adf233b7.tar.gz CMake-509f2713bfa0a289851dfd8d6e45a356adf233b7.tar.bz2 |
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.
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |