diff options
| -rw-r--r-- | test/inc/test/filters-test.hxx | 3 | ||||
| -rw-r--r-- | test/source/filters-test.cxx | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/test/inc/test/filters-test.hxx b/test/inc/test/filters-test.hxx index 6c82944d1cac..ab83c55e8f10 100644 --- a/test/inc/test/filters-test.hxx +++ b/test/inc/test/filters-test.hxx @@ -42,8 +42,7 @@ enum filterStatus /* * NOTE, any files beginning with CVE- will be assumed to be encrypted using - * arcfour with key 0x435645, this is just to silence panicky - * virus/malware-checkers + * arcfour with key 0x435645, this is to silence panicky virus/malware-checkers * * e.g. m[de]crypt --bare -a arcfour -o hex -k 435645 -s 3 */ diff --git a/test/source/filters-test.cxx b/test/source/filters-test.cxx index f80fd43aba09..1cb085dc4afc 100644 --- a/test/source/filters-test.cxx +++ b/test/source/filters-test.cxx @@ -113,8 +113,7 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin //output name early, so in the case of a hang, the name of //the hanging input file is visible - if (nExpected == test::indeterminate) - fprintf(stderr, "%s,", aRes.getStr()); + fprintf(stderr, "%s,", aRes.getStr()); sal_uInt32 nStartTime = osl_getGlobalTimer(); bool bRes = load(rFilter, sURL, rUserData); sal_uInt32 nEndTime = osl_getGlobalTimer(); @@ -122,12 +121,10 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin if (bCVE) CPPUNIT_ASSERT(osl::FileBase::E_None == osl::File::remove(sTmpFile)); + fprintf(stderr, "%s,%"SAL_PRIuUINT32"\n", + bRes?"Pass":"Fail",nEndTime-nStartTime); if (nExpected == test::indeterminate) - { - fprintf(stderr, "%s,%"SAL_PRIuUINT32"\n", - bRes?"Pass":"Fail",nEndTime-nStartTime); continue; - } CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == nExpected); } } |