[Libreoffice-commits] core.git: vcl/qa

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Thu Jun 21 09:11:44 UTC 2018


 vcl/qa/cppunit/FontFeatureTest.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 50c8eb70e6ae68794d0867c86c96f4f1b946e38e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Jun 21 11:10:16 2018 +0200

    disable testGetFontFeatures if bundled fonts aren't available
    
    Change-Id: Ie644e605f749a486ba4590d1ec2a9536a06c9847

diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx b/vcl/qa/cppunit/FontFeatureTest.cxx
index 5ab293574d71..866c69f463f8 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -35,6 +35,9 @@ public:
 
 void FontFeatureTest::testGetFontFeatures()
 {
+// "Linux Libertine G" is a font bundeled with LO, but sometimes the
+// bundled fonts aren't available so we need to disable test in that case
+#if !TEST_FONTS_MISSING
     ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(),
                                               DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
     aVDev->SetOutputSizePixel(Size(10, 10));
@@ -104,6 +107,7 @@ void FontFeatureTest::testGetFontFeatures()
         CPPUNIT_ASSERT_EQUAL(sal_uInt32(2), rParameter2.getCode());
         CPPUNIT_ASSERT(!rParameter2.getDescription().isEmpty());
     }
+#endif // !TEST_FONTS_MISSING
 }
 
 void FontFeatureTest::testParseFeature()


More information about the Libreoffice-commits mailing list