Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-08 19:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROSAUTOTEST]

Browse source 
Try to print whole lines so the output from tests doesn't get mixed with debug output from other reactos components.

svn path=/trunk/; revision=55618
This commit is contained in:
Kamil Hornicek 2012-02-15 21:18:13 +00:00
parent 4b16693aed
commit 032a2af1fb
1 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
rostests/rosautotest/tools.cpp
View file

@ -96,7 +96,7 @@ void
StringOut(const string& String) StringOut(const string& String)
{ {
char DbgString[DBGPRINT_BUFSIZE + 1]; char DbgString[DBGPRINT_BUFSIZE + 1];
size_t i; size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0;
string NewString; string NewString;
/* Unify the line endings (the piped output of the tests may use CRLF) */ /* Unify the line endings (the piped output of the tests may use CRLF) */
@ -113,26 +113,44 @@ StringOut(const string& String)
/* Otherwise copy the string */ /* Otherwise copy the string */
NewString += String[i]; NewString += String[i];
} }
curr_pos = NewString.size();
/* Try to print whole lines but obey the 512 bytes chunk size limit*/
if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE)
{
if((curr_pos - start) > DBGPRINT_BUFSIZE || NewString[curr_pos - 1] != '\n')
{
/* No newlines, print what we have and start over*/
if(NewString[curr_pos - 1] != '\n')
{
size = curr_pos - start;
memcpy(DbgString, NewString.c_str() + start, size);
start = curr_pos;
}
else
{
size = last_newline - start;
memcpy(DbgString, NewString.c_str() + start, size);
start = last_newline;
}
DbgString[size] = 0;
DbgPrint(DbgString);
}
last_newline = curr_pos;
}
} }
/* Output the string. /* The rest of the string is <= DBGPRINT_BUFSIZE so just print it*/
For DbgPrint, this must be done in chunks of 512 bytes. */ size = curr_pos - start;
memcpy(DbgString, NewString.c_str() + start, size);
DbgString[size] = 0;
DbgPrint(DbgString);
/* Output the string */
cout << NewString; cout << NewString;
for(i = 0; i < NewString.size(); i += DBGPRINT_BUFSIZE)
{
size_t BytesToCopy;
if(NewString.size() - i > DBGPRINT_BUFSIZE)
BytesToCopy = DBGPRINT_BUFSIZE;
else
BytesToCopy = NewString.size() - i;
memcpy(DbgString, NewString.c_str() + i, BytesToCopy);
DbgString[BytesToCopy] = 0;
DbgPrint(DbgString);
}
} }
/** /**