solenv/gbuild/UIConfig.mk | 15 +++++++++++++-- sw/qa/extras/odfexport/odfexport.cxx | 7 +++---- 2 files changed, 16 insertions(+), 6 deletions(-)
New commits: commit 80cee87b3d398837d5b665f3e83ae8a4e6a9ea0f Author: Samuel Thibault <sthiba...@hypra.fr> Date: Fri May 4 13:46:39 2018 +0200 gbuild: Add function to only run gla11y on .ui files This adds gb_UIConfig_add_a11yerrors_uifiles to request running gla11y on .ui files without involving the rest of the .ui processing. Change-Id: Ic2478705037c98c6cdd493c3930b6ab8ef166b04 Reviewed-on: https://gerrit.libreoffice.org/53924 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 1eee6edf1922..154e9be51149 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -248,6 +248,12 @@ $(call gb_UIConfig__package_file,$(1),$(2),ui,$(3),$(4)) endef +define gb_UIConfig_add_a11yerrors_uifile +$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui +$(call gb_UIConfig_get_a11yerrors_target,$(1)) : $(SRCDIR)/$(2).ui + +endef + # gb_UIConfig__add_uifile target file define gb_UIConfig__add_uifile $(call gb_UIConfig__package_uifile,$(1),$(call gb_UIConfig_get_packagename,$(1)),$(notdir $(2)).ui,$(2).ui) @@ -257,8 +263,7 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : UI_IMAGELISTS += $(call gb_UIIma $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call gb_UIImageListTarget_get_target,$(2)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIImageListTarget_get_clean_target,$(2)) -$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui -$(call gb_UIConfig_get_a11yerrors_target,$(1)) : $(SRCDIR)/$(2).ui +$(call gb_UIConfig_add_a11yerrors_uifile,$(1),$(2)) endef @@ -282,6 +287,12 @@ $(foreach uifile,$(2),$(call gb_UIConfig_add_uifile,$(1),$(uifile))) endef +# gb_UIConfig_add_uifiles target uifile(s) but only for running gla11y +define gb_UIConfig_add_a11yerrors_uifiles +$(foreach uifile,$(2),$(call gb_UIConfig_add_a11yerrors_uifile,$(1),$(uifile))) + +endef + # gb_UIConfig__add_xmlfile target package-target type xmlfile define gb_UIConfig__add_xmlfile $(call gb_UIConfig__package_file,$(1),$(call gb_UIConfig_get_packagename,$(2)),$(3),$(notdir $(4)).xml,$(4).xml) commit fe192a7b7485379625a4d91ad6e3a9e6280add2c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 8 11:16:16 2018 +0200 Enable CppunitTest_sw_odfexport for MACOSX The whole boy of sw/qa/extras/odfexport/odfexport.cxx had been disabled for MACOSX and WNT with effeb7b039bbed5e4eb0c4af1f600b61ffbb4546 "sw/qa: 1 individual unit test per filter (import/export) test", for no clear reason, then enabled again for WNT (but left disabled for MACOSX) with 960db7d4a875897addb8a28257da38138babb264 "CppunitTest_sw_odfexport: enable on Windows". What fails for me on macOS is > /Users/stephan/Software/lo/core/test/source/xmltesttools.cxx:71: Assertion > Test name: testEmbeddedFontProps::Import_Export_Import > equality assertion failed > - Expected: 1 > - Actual : 0 > - In <file:///Users/stephan/Software/lo/TMPDIR/libtest_sw_odfexport.dylibf8drfk.tmp>, XPath '//style:font-face[@style:name='Liberation Serif']/svg:font-face-src/svg:font-face-uri[1]' number of nodes is incorrect > > /Users/stephan/Software/lo/core/sw/qa/extras/odfexport/odfexport.cxx:1948: Assertion > Test name: testBulletAsImage::Import > equality assertion failed > - Expected: 15 > - Actual : 17 > > /Users/stephan/Software/lo/core/sw/qa/extras/odfexport/odfexport.cxx:1948: Assertion > Test name: testBulletAsImage::Import_Export_Import > equality assertion failed > - Expected: 15 > - Actual : 17 > > Failures !!! > Run: 99 Failure total: 3 Failures: 3 Errors: 0 of which the first was already disabled individually for WNT (so disabled it for MACOSX, too), and the latter two are covered by a new TODO disabling just the relevant CPPUNIT_ASSERT_EQUAL for MACOSX for now. Change-Id: I233f71dc9566b1e21d34f4ef65cbddb364bb6f03 Reviewed-on: https://gerrit.libreoffice.org/53961 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index c2da82ffcaa3..375d7ed04958 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -13,7 +13,6 @@ #include <initializer_list> -#if !defined(MACOSX) #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/container/XIndexReplace.hpp> @@ -1828,7 +1827,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt") DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt") { -#if !defined(WNT) +#if !defined(MACOSX) && !defined(WNT) // Test that font style/weight of embedded fonts is exposed. // Test file is a normal ODT, except EmbedFonts is set to true in settings.xml. if (xmlDocPtr pXmlDoc = parseExport("content.xml")) @@ -1946,8 +1945,10 @@ DECLARE_ODFEXPORT_TEST(testBulletAsImage, "BulletAsImage.odt") Graphic aGraphic(uno::Reference<graphic::XGraphic>(xBitmap, uno::UNO_QUERY)); CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType()); CPPUNIT_ASSERT(aGraphic.GetSizeBytes() > sal_uLong(0)); +#if !defined(MACOSX) //TODO: 17 vs. 15 CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Width()); CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Height()); +#endif } DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fodt") @@ -2007,7 +2008,5 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt" } } -#endif - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits