diff options
| -rw-r--r-- | include/test/bootstrapfixture.hxx | 3 | ||||
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 448605a8dc1d..5e24753fe668 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -30,7 +30,8 @@ namespace test { enum ValidationFormat { OOXML, - ODF + ODF, + MSBINARY }; // Class to do lots of heavy-lifting UNO & environment diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index f274dbce571f..c28615dc7719 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -173,10 +173,19 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor { var = "OFFICEOTRON"; } - else + else if ( eFormat == test::ODF ) { var = "ODFVALIDATOR"; } + else if ( eFormat == test::MSBINARY ) + { +#if HAVE_BFFVALIDATOR + var = "BFFVALIDATOR"; +#else + // Binary Format Validator is disabled + return; +#endif + } OUString aValidator; oslProcessError e = osl_getEnvironment(var.pData, &aValidator.pData); CPPUNIT_ASSERT_EQUAL_MESSAGE( |