From 9b4a3fb16f2db09a61a4b53f40f1b3c15540b123 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Fri, 14 May 2021 17:32:51 +0200 Subject: [PATCH] sw: split CppunitTest_sw_layoutwriter into 2 It already has 2 cxx files Change-Id: I74aeea953568b82aff3130b20547a7c207783431 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115628 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- sw/CppunitTest_sw_layoutwriter.mk | 72 +------------------------ sw/CppunitTest_sw_layoutwriter2.mk | 14 +++++ sw/Module_sw.mk | 2 + sw/layoutwriter_setup.mk | 87 ++++++++++++++++++++++++++++++ sw/qa/extras/layout/layout2.cxx | 2 + 5 files changed, 107 insertions(+), 70 deletions(-) create mode 100644 sw/CppunitTest_sw_layoutwriter2.mk create mode 100644 sw/layoutwriter_setup.mk diff --git a/sw/CppunitTest_sw_layoutwriter.mk b/sw/CppunitTest_sw_layoutwriter.mk index 7e00738cd268..d1a7508ea50e 100644 --- a/sw/CppunitTest_sw_layoutwriter.mk +++ b/sw/CppunitTest_sw_layoutwriter.mk @@ -9,75 +9,7 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sw_layoutwriter)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_layoutwriter)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_layoutwriter, \ - sw/qa/extras/layout/layout \ - sw/qa/extras/layout/layout2 \ -)) - -# note: this links msword only for the reason to have an order dependency, -# because "make sw.check" will not see the dependency through services.rdb -$(eval $(call gb_CppunitTest_use_libraries,sw_layoutwriter, \ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - msword \ - sal \ - sfx \ - svl \ - svt \ - svxcore \ - sw \ - swqahelper \ - test \ - unotest \ - vcl \ - tl \ - utl \ - i18nlangtag \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_layoutwriter,\ - boost_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_layoutwriter,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/uibase/inc \ - -I$(SRCDIR)/sw/qa/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_layoutwriter,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sw_layoutwriter)) -$(eval $(call gb_CppunitTest_use_vcl,sw_layoutwriter)) - -$(eval $(call gb_CppunitTest_use_rdb,sw_layoutwriter,services)) - -$(eval $(call gb_CppunitTest_use_custom_headers,sw_layoutwriter,\ - officecfg/registry \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_layoutwriter)) - -$(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter, \ - modules/swriter \ -)) - -$(call gb_CppunitTest_get_target,sw_layoutwriter): \ - $(call gb_Library_get_target,textconv_dict) - -$(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter)) +# empty second argument (i.e. no 1) +$(eval $(call sw_layoutwriter_test,)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_layoutwriter2.mk b/sw/CppunitTest_sw_layoutwriter2.mk new file mode 100644 index 000000000000..f78146342db7 --- /dev/null +++ b/sw/CppunitTest_sw_layoutwriter2.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_layoutwriter_test,2)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index cdd515a693b1..ec80078eadff 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -17,6 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +include $(SRCDIR)/sw/layoutwriter_setup.mk include $(SRCDIR)/sw/ooxmlexport_setup.mk include $(SRCDIR)/sw/uiwriter_setup.mk @@ -107,6 +108,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_uiwriter3 \ ) \ CppunitTest_sw_layoutwriter \ + CppunitTest_sw_layoutwriter2 \ CppunitTest_sw_mailmerge \ CppunitTest_sw_globalfilter \ CppunitTest_sw_accessible_relation_set \ diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk new file mode 100644 index 000000000000..0fb848f106de --- /dev/null +++ b/sw/layoutwriter_setup.mk @@ -0,0 +1,87 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +# template for layoutwriter tests (there are several so that they can be run in parallel) +define sw_layoutwriter_test + +$(eval $(call gb_CppunitTest_CppunitTest,sw_layoutwriter$(1))) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_layoutwriter$(1))) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_layoutwriter$(1), \ + sw/qa/extras/layout/layout$(1) \ +)) + +# note: this links msword only for the reason to have an order dependency, +# because "make sw.check" will not see the dependency through services.rdb +$(eval $(call gb_CppunitTest_use_libraries,sw_layoutwriter$(1), \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + msword \ + sal \ + sfx \ + svl \ + svt \ + svxcore \ + sw \ + swqahelper \ + test \ + unotest \ + vcl \ + tl \ + utl \ + i18nlangtag \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_layoutwriter$(1),\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_layoutwriter$(1),\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_layoutwriter$(1),\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_layoutwriter$(1))) +$(eval $(call gb_CppunitTest_use_vcl,sw_layoutwriter$(1))) + +$(eval $(call gb_CppunitTest_use_rdb,sw_layoutwriter$(1),services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_layoutwriter$(1),\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_layoutwriter$(1))) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter$(1), \ + modules/swriter \ +)) + +$(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \ + $(call gb_Library_get_target,textconv_dict) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter$(1))) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index 074f099d963e..8846ff6a914e 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -2843,4 +2843,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf135035) CPPUNIT_ASSERT_GREATER(nParentWidth, nFly3Width); } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */