mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up output

Browse Source 
Change-Id: I4fbcd03e4af82ba8e3697651ddce92ba0ba450a6
This commit is contained in:
Stephan Bergmann
2015-08-24 17:03:06 +02:00
parent 82fb80ec22
commit a4ef3f4eb1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unotest/source/cpp/filters-test.cxx
View File

@@ -122,7 +122,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
//output name early, so in the case of a hang, the name of //output name early, so in the case of a hang, the name of
//the hanging input file is visible //the hanging input file is visible
fprintf(stderr, "%s,", aRes.getStr()); fprintf(stderr, "Testing %s:\n", aRes.getStr());
sal_uInt32 nStartTime = osl_getGlobalTimer(); sal_uInt32 nStartTime = osl_getGlobalTimer();
bool bRes; bool bRes;
if (!bExport) if (!bExport)
@@ -136,8 +136,8 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
if (bEncrypted) if (bEncrypted)
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::remove(sTmpFile)); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::remove(sTmpFile));
fprintf(stderr, "%s,%" SAL_PRIuUINT32"\n", fprintf(stderr, "Tested %s: %s (%" SAL_PRIuUINT32 "ms)\n",
bRes?"Pass":"Fail",nEndTime-nStartTime); aRes.getStr(), bRes?"Pass":"Fail", nEndTime-nStartTime);
if (nExpected == test::indeterminate) if (nExpected == test::indeterminate)
continue; continue;
filterStatus nResult = bRes ? test::pass : test::fail; filterStatus nResult = bRes ? test::pass : test::fail;
@@ -151,7 +151,6 @@ void FiltersTest::testDir(const OUString &rFilter,
SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID, SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID,
unsigned int nFilterVersion, bool bExport) unsigned int nFilterVersion, bool bExport)
{ {
fprintf(stderr, "File tested,Test Result,Execution tools::Time (ms)\n");
recursiveScan(test::pass, rFilter, recursiveScan(test::pass, rFilter,
rURL + "pass", rURL + "pass",
rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport); rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport);