mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-27 04:09:36 +03:00
Code Activity

CTest: Fix decoding of MBCS character split by buffering

Browse Source 
Use a single `cmProcessOutput` instance persistently to decode
all output of a test process so that partial character bytes
can be buffered.
This commit is contained in:
Brad King
2018-01-17 10:41:51 -05:00
parent b4dfe1d816
commit c10119df62
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmProcess.cxx
+7 -8
View File
@@ -5,19 +5,19 @@
#include "cmCTest.h"
#include "cmCTestRunTest.h"
#include "cmCTestTestHandler.h"
#include "cmProcessOutput.h"
#include "cmsys/Process.h"
#include <algorithm>
#include <fcntl.h>
#include <iostream>
#include <signal.h>
#include <stdint.h>
#include <string>
#if !defined(_WIN32)
#include <unistd.h>
#endif
#define CM_PROCESS_BUF_SIZE 65536
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <io.h>
@@ -60,6 +60,7 @@ static int cmProcessGetPipes(int* fds)
cmProcess::cmProcess(cmCTestRunTest& runner)
: Runner(runner)
, Conv(cmProcessOutput::UTF8, CM_PROCESS_BUF_SIZE)
{
this->Timeout = std::chrono::duration<double>::zero();
this->TotalTime = std::chrono::duration<double>::zero();
@@ -232,9 +233,7 @@ void cmProcess::OnRead(ssize_t nread, const uv_buf_t* buf)
std::string line;
if (nread > 0) {
std::string strdata;
cmProcessOutput processOutput(cmProcessOutput::UTF8,
static_cast<unsigned int>(buf->len));
processOutput.DecodeText(buf->base, static_cast<size_t>(nread), strdata);
this->Conv.DecodeText(buf->base, static_cast<size_t>(nread), strdata);
this->Output.insert(this->Output.end(), strdata.begin(), strdata.end());
while (this->Output.GetLine(line)) {
@@ -271,10 +270,10 @@ void cmProcess::OnAllocateCB(uv_handle_t* handle, size_t suggested_size,
self->OnAllocate(suggested_size, buf);
}
void cmProcess::OnAllocate(size_t suggested_size, uv_buf_t* buf)
void cmProcess::OnAllocate(size_t /*suggested_size*/, uv_buf_t* buf)
{
if (this->Buf.size() < suggested_size) {
this->Buf.resize(suggested_size);
if (this->Buf.size() != CM_PROCESS_BUF_SIZE) {
this->Buf.resize(CM_PROCESS_BUF_SIZE);
}
*buf =
Source/CTest/cmProcess.h
+3 -1
View File
@@ -5,13 +5,14 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmProcessOutput.h"
#include "cmUVHandlePtr.h"
#include "cm_uv.h"
#include <chrono>
#include <stddef.h>
#include <stdint.h>
#include <string>
#include <sys/types.h>
#include <vector>
class cmCTestRunTest;
@@ -80,6 +81,7 @@ private:
std::vector<char> Buf;
cmCTestRunTest& Runner;
cmProcessOutput Conv;
int Signal = 0;
cmProcess::State ProcessState = cmProcess::State::Starting;