[ROSAUTOTEST]

- Revert r66855 to make the upcoming commit's diff show my actual changes.
ROSTESTS-178 ROSTESTS-158

svn path=/trunk/; revision=68245
This commit is contained in:
Thomas Faber 2015-06-23 09:54:46 +00:00
parent f710a888d6
commit 77ad885551
3 changed files with 73 additions and 22 deletions

View file

@ -276,6 +276,7 @@ CWineTest::RunTest(CTestInfo* TestInfo)
stringstream ss, ssFinish;
DWORD StartTime;
float TotalTime;
string tailString;
CPipe Pipe;
char Buffer[1024];
@ -294,7 +295,7 @@ CWineTest::RunTest(CTestInfo* TestInfo)
{
/* Output text through StringOut, even while the test is still running */
Buffer[BytesAvailable] = 0;
StringOut(string(Buffer));
tailString = StringOut(tailString.append(string(Buffer)), false);
if(Configuration.DoSubmit())
TestInfo->Log += Buffer;
@ -304,10 +305,17 @@ CWineTest::RunTest(CTestInfo* TestInfo)
}
catch(CTestException& e)
{
if(!tailString.empty())
StringOut(tailString);
tailString.clear();
StringOut(e.GetMessage());
TestInfo->Log += e.GetMessage();
}
/* Print what's left */
if(!tailString.empty())
StringOut(tailString);
TotalTime = ((float)GetTickCount() - StartTime)/1000;
ssFinish << "Test " << TestInfo->Test << " completed in ";
ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl;