editeng/CppunitTest_editeng_core.mk | 2 ++ editeng/qa/unit/core-test.cxx | 8 ++++++++ 2 files changed, 10 insertions(+)
New commits: commit 5521184be8873552879f1118af529e3a9cac83ba Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Thu Oct 11 10:20:55 2018 +0000 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Thu Oct 11 16:02:33 2018 +0200 Make editeng_core test depend on more_fonts CppunitTest_editeng_core explicitly request the "Liberation Sans" font. Change-Id: I810bddda26498252985f1869df58610e79ebc5ef Reviewed-on: https://gerrit.libreoffice.org/61658 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 752af13f5d82..3b3a999e8fa0 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -73,4 +73,6 @@ $(eval $(call gb_CppunitTest_use_components,editeng_core,\ $(eval $(call gb_CppunitTest_use_configuration,editeng_core)) +$(eval $(call gb_CppunitTest_use_more_fonts,editeng_core)) + # vim: set noet sw=4 ts=4: diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 1e0673677653..106c8963a226 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_features.h> + #include <test/bootstrapfixture.hxx> #include <cppunit/TestFixture.h> @@ -50,8 +52,10 @@ public: virtual void setUp() override; virtual void tearDown() override; +#if HAVE_MORE_FONTS /// Test text portions position when percentage line spacing is set void testLineSpacing(); +#endif void testConstruction(); @@ -102,7 +106,9 @@ public: DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void ); CPPUNIT_TEST_SUITE(Test); +#if HAVE_MORE_FONTS CPPUNIT_TEST(testLineSpacing); +#endif CPPUNIT_TEST(testConstruction); CPPUNIT_TEST(testUnoTextFields); CPPUNIT_TEST(testAutocorrect); @@ -143,6 +149,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } +#if HAVE_MORE_FONTS void Test::testLineSpacing() { // Create EditEngine's instance @@ -219,6 +226,7 @@ void Test::testLineSpacing() // Test upper Word limit - 13200% (factor 132) doTest(13200, 33615, 33660); } +#endif void Test::testConstruction() { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
