sw/CppunitTest_sw_uiwriter.mk | 2 sw/CppunitTest_sw_uiwriter2.mk | 89 ++++++++++++++++++++++++++++++++++++ sw/CppunitTest_sw_uiwriter3.mk | 89 ++++++++++++++++++++++++++++++++++++ sw/Module_sw.mk | 2 sw/qa/extras/uiwriter/uiwriter2.cxx | 3 + sw/qa/extras/uiwriter/uiwriter3.cxx | 2 6 files changed, 185 insertions(+), 2 deletions(-)
New commits: commit 2344f7a25a2961434f7d7c65bfb93bbdaf913f9a Author: Michael Stahl <[email protected]> AuthorDate: Sat Dec 19 20:19:43 2020 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Sat Dec 19 22:48:03 2020 +0100 sw: split CppunitTest_sw_uiwriter into 3 It already has 3 cxx files, and takes by far the longest to run. The split isn't ideal at 241/71/162 but still an improvement. Change-Id: I59215475724cbf0e38b890d7be6d60a23dccf0a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108030 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index 1e7a4d279ac0..fce3367bd0e7 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -15,8 +15,6 @@ $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter, \ sw/qa/extras/uiwriter/uiwriter \ - sw/qa/extras/uiwriter/uiwriter2 \ - sw/qa/extras/uiwriter/uiwriter3 \ )) # note: this links msword only for the reason to have an order dependency, diff --git a/sw/CppunitTest_sw_uiwriter2.mk b/sw/CppunitTest_sw_uiwriter2.mk new file mode 100644 index 000000000000..898fd23645d4 --- /dev/null +++ b/sw/CppunitTest_sw_uiwriter2.mk @@ -0,0 +1,89 @@ +# -*- 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 gb_CppunitTest_CppunitTest,sw_uiwriter2)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter2)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter2, \ + sw/qa/extras/uiwriter/uiwriter2 \ +)) + +# 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_uiwriter2, \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nlangtag \ + msword \ + sal \ + sfx \ + svl \ + svt \ + svxcore \ + sw \ + swqahelper \ + test \ + unotest \ + vcl \ + tl \ + utl \ + svx \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter2,\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_uiwriter2,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/filter/html \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_uiwriter2,\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter2)) +$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter2)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter2,services)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter2)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter2, \ + modules/swriter \ + sfx \ + svt \ + svx \ +)) + +$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter2, \ + oox_customshapes \ + sfx2_classification \ +)) + +$(call gb_CppunitTest_get_target,sw_uiwriter2): \ + $(call gb_Library_get_target,textconv_dict) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter2)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uiwriter3.mk b/sw/CppunitTest_sw_uiwriter3.mk new file mode 100644 index 000000000000..4bea79b99da6 --- /dev/null +++ b/sw/CppunitTest_sw_uiwriter3.mk @@ -0,0 +1,89 @@ +# -*- 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 gb_CppunitTest_CppunitTest,sw_uiwriter3)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter3)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter3, \ + sw/qa/extras/uiwriter/uiwriter3 \ +)) + +# 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_uiwriter3, \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nlangtag \ + msword \ + sal \ + sfx \ + svl \ + svt \ + svxcore \ + sw \ + swqahelper \ + test \ + unotest \ + vcl \ + tl \ + utl \ + svx \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter3,\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_uiwriter3,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/filter/html \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_uiwriter3,\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter3)) +$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter3)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter3,services)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter3)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter3, \ + modules/swriter \ + sfx \ + svt \ + svx \ +)) + +$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter3, \ + oox_customshapes \ + sfx2_classification \ +)) + +$(call gb_CppunitTest_get_target,sw_uiwriter3): \ + $(call gb_Library_get_target,textconv_dict) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter3)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 947d3293aa51..65acc6c7b744 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -101,6 +101,8 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_txtimport \ $(if $(filter-out MACOSX,$(OS)), \ CppunitTest_sw_uiwriter \ + CppunitTest_sw_uiwriter2 \ + CppunitTest_sw_uiwriter3 \ ) \ CppunitTest_sw_layoutwriter \ CppunitTest_sw_mailmerge \ diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 496b9b8602bc..3ad15af8c0ac 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -3536,4 +3536,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf123218) aScaleData = xYAxis->getScaleData(); CPPUNIT_ASSERT_EQUAL(chart2::AxisOrientation_REVERSE, aScaleData.Orientation); } + +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index 7da4e05b03f9..a598386ede3d 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -2133,4 +2133,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138897) Scheduler::ProcessEventsToIdle(); } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
