[Libreoffice-commits] core.git: 2 commits - connectivity/qa sc/CppunitTest_sc_ucalc_pivottable.mk sc/CppunitTest_sc_ucalc_sharedformula.mk sc/CppunitTest_sc_ucalc_sort.mk sc/Module_sc.mk sc/ucalc_setup.mk
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 14 10:46:33 UTC 2021
connectivity/qa/connectivity/resource/sharedresources_test.cxx | 9
sc/CppunitTest_sc_ucalc_pivottable.mk | 107 --------
sc/CppunitTest_sc_ucalc_sharedformula.mk | 107 --------
sc/CppunitTest_sc_ucalc_sort.mk | 107 --------
sc/Module_sc.mk | 1
sc/ucalc_setup.mk | 124 ++++++++++
6 files changed, 133 insertions(+), 322 deletions(-)
New commits:
commit f40cbba63f13e7081fc5901769651fd4d43ea34d
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri May 14 11:34:13 2021 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri May 14 12:45:59 2021 +0200
Directly initialize vector in sharedresources_test.cxx
Change-Id: I5341272a33127a7cb19d477593d906ebd0c6bdec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115592
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/connectivity/qa/connectivity/resource/sharedresources_test.cxx b/connectivity/qa/connectivity/resource/sharedresources_test.cxx
index a6bf22fba858..dfc62a763bbd 100644
--- a/connectivity/qa/connectivity/resource/sharedresources_test.cxx
+++ b/connectivity/qa/connectivity/resource/sharedresources_test.cxx
@@ -88,10 +88,11 @@ void SharedResourcesTest::testGetSourceStringWithSubstitutionThree()
void SharedResourcesTest::testGetSourceStringWithSubstitutionVector()
{
- std::vector<std::pair<const char*, OUString>> aStringToSubstitutes;
- aStringToSubstitutes.push_back(std::pair<const char*, OUString>("$sub0$", "vector0"));
- aStringToSubstitutes.push_back(std::pair<const char*, OUString>("$sub1$", "vector1"));
- aStringToSubstitutes.push_back(std::pair<const char*, OUString>("$sub2$", "vector2"));
+ std::vector<std::pair<const char*, OUString>> aStringToSubstitutes{
+ std::pair<const char*, OUString>("$sub0$", "vector0"),
+ std::pair<const char*, OUString>("$sub1$", "vector1"),
+ std::pair<const char*, OUString>("$sub2$", "vector2")
+ };
CPPUNIT_ASSERT_EQUAL(OUString("Three substitution vector0 vector1 vector2"),
m_aResource.getResourceStringWithSubstitution(
commit f2736a462ea764e6f5abc95747c52e48d507b345
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri May 14 01:34:19 2021 +0200
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri May 14 12:45:42 2021 +0200
sc_ucalc: Use a template for makefiles
Change-Id: I2146ded4c8c0eb8ba7814f76f3ec5d9030a67857
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115578
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sc/CppunitTest_sc_ucalc_pivottable.mk b/sc/CppunitTest_sc_ucalc_pivottable.mk
index fbf88762bd78..b93593ca97d8 100644
--- a/sc/CppunitTest_sc_ucalc_pivottable.mk
+++ b/sc/CppunitTest_sc_ucalc_pivottable.mk
@@ -9,111 +9,6 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc_pivottable))
-
-$(eval $(call gb_Library_use_common_precompiled_header,sc_ucalc_pivottable))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc_pivottable, \
- sc/qa/unit/ucalc_pivottable \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc_pivottable, \
- sc \
- scqahelper \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_ucalc_pivottable,\
- boost_headers \
- $(call gb_Helper_optional,OPENCL, \
- clew) \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
- orcus \
- orcus-parser \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc_pivottable, \
- $(call gb_Helper_optional,AVMEDIA,avmedia) \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- i18nutil \
- $(call gb_Helper_optional,OPENCL, \
- opencl) \
- sal \
- salhelper \
- sax \
- sb \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- vbahelper \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_ucalc_pivottable,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_ucalc_pivottable,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc_pivottable,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_ucalc_pivottable))
-$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc_pivottable))
-
-$(eval $(call gb_CppunitTest_use_components,sc_ucalc_pivottable,\
- configmgr/source/configmgr \
- framework/util/fwk \
- i18npool/source/search/i18nsearch \
- i18npool/util/i18npool \
- sax/source/expatwrap/expwrap \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scaddins/source/pricing/pricing \
- sfx2/util/sfx \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
- uui/util/uui \
- vcl/vcl.common \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_CppunitTest_add_libs,sc_ucalc_pivottable,\
- -lrt \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc_pivottable))
+$(eval $(call sc_ucalc_test,_pivottable))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_sharedformula.mk b/sc/CppunitTest_sc_ucalc_sharedformula.mk
index 6dca333f0013..b40cb7b4985f 100644
--- a/sc/CppunitTest_sc_ucalc_sharedformula.mk
+++ b/sc/CppunitTest_sc_ucalc_sharedformula.mk
@@ -9,111 +9,6 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc_sharedformula))
-
-$(eval $(call gb_Library_use_common_precompiled_header,sc_ucalc_sharedformula))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc_sharedformula, \
- sc/qa/unit/ucalc_sharedformula \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc_sharedformula, \
- sc \
- scqahelper \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_ucalc_sharedformula,\
- boost_headers \
- $(call gb_Helper_optional,OPENCL, \
- clew) \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
- orcus \
- orcus-parser \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc_sharedformula, \
- $(call gb_Helper_optional,AVMEDIA,avmedia) \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- i18nutil \
- $(call gb_Helper_optional,OPENCL, \
- opencl) \
- sal \
- salhelper \
- sax \
- sb \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- vbahelper \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_ucalc_sharedformula,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_ucalc_sharedformula,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc_sharedformula,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_ucalc_sharedformula))
-$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc_sharedformula))
-
-$(eval $(call gb_CppunitTest_use_components,sc_ucalc_sharedformula,\
- configmgr/source/configmgr \
- framework/util/fwk \
- i18npool/source/search/i18nsearch \
- i18npool/util/i18npool \
- sax/source/expatwrap/expwrap \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scaddins/source/pricing/pricing \
- sfx2/util/sfx \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
- uui/util/uui \
- vcl/vcl.common \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_CppunitTest_add_libs,sc_ucalc_sharedformula,\
- -lrt \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc_sharedformula))
+$(eval $(call sc_ucalc_test,_sharedformula))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_sort.mk b/sc/CppunitTest_sc_ucalc_sort.mk
index 4e598889817a..56235908ad73 100644
--- a/sc/CppunitTest_sc_ucalc_sort.mk
+++ b/sc/CppunitTest_sc_ucalc_sort.mk
@@ -9,111 +9,6 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc_sort))
-
-$(eval $(call gb_Library_use_common_precompiled_header,sc_ucalc_sort))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc_sort, \
- sc/qa/unit/ucalc_sort \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc_sort, \
- sc \
- scqahelper \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_ucalc_sort,\
- boost_headers \
- $(call gb_Helper_optional,OPENCL, \
- clew) \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
- orcus \
- orcus-parser \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc_sort, \
- $(call gb_Helper_optional,AVMEDIA,avmedia) \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- i18nutil \
- $(call gb_Helper_optional,OPENCL, \
- opencl) \
- sal \
- salhelper \
- sax \
- sb \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- vbahelper \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_ucalc_sort,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_ucalc_sort,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc_sort,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_ucalc_sort))
-$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc_sort))
-
-$(eval $(call gb_CppunitTest_use_components,sc_ucalc_sort,\
- configmgr/source/configmgr \
- framework/util/fwk \
- i18npool/source/search/i18nsearch \
- i18npool/util/i18npool \
- sax/source/expatwrap/expwrap \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scaddins/source/pricing/pricing \
- sfx2/util/sfx \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
- uui/util/uui \
- vcl/vcl.common \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_CppunitTest_add_libs,sc_ucalc_sort,\
- -lrt \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc_sort))
+$(eval $(call sc_ucalc_test,_sort))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index f2428ded2919..2beb6361d330 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -9,6 +9,7 @@
#
include $(SRCDIR)/sc/common_unoapi_tests.mk
+include $(SRCDIR)/sc/ucalc_setup.mk
$(eval $(call gb_Module_Module,sc))
diff --git a/sc/ucalc_setup.mk b/sc/ucalc_setup.mk
new file mode 100644
index 000000000000..a678ad11850e
--- /dev/null
+++ b/sc/ucalc_setup.mk
@@ -0,0 +1,124 @@
+# -*- 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 ucalc tests
+define sc_ucalc_test
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc$(1)))
+
+$(eval $(call gb_Library_use_common_precompiled_header,sc_ucalc$(1)))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc$(1), \
+ sc/qa/unit/ucalc$(1) \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc$(1), \
+ sc \
+ scqahelper \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc$(1),\
+ boost_headers \
+ $(call gb_Helper_optional,OPENCL, \
+ clew) \
+ icu_headers \
+ icui18n \
+ icuuc \
+ libxml2 \
+ mdds_headers \
+ orcus \
+ orcus-parser \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc$(1), \
+ $(call gb_Helper_optional,AVMEDIA,avmedia) \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ drawinglayer \
+ editeng \
+ for \
+ forui \
+ i18nlangtag \
+ i18nutil \
+ $(call gb_Helper_optional,OPENCL, \
+ opencl) \
+ sal \
+ salhelper \
+ sax \
+ sb \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ test \
+ tk \
+ tl \
+ ucbhelper \
+ unotest \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_ucalc$(1),\
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/source/core/inc \
+ -I$(SRCDIR)/sc/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_ucalc$(1),\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc$(1),\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_ucalc$(1)))
+$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc$(1)))
+
+$(eval $(call gb_CppunitTest_use_components,sc_ucalc$(1),\
+ configmgr/source/configmgr \
+ framework/util/fwk \
+ i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
+ sax/source/expatwrap/expwrap \
+ scaddins/source/analysis/analysis \
+ scaddins/source/datefunc/date \
+ scaddins/source/pricing/pricing \
+ sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+ uui/util/uui \
+ vcl/vcl.common \
+))
+
+$(eval $(call gb_CppunitTest_add_libs,sc_ucalc$(1),\
+ $(if $(filter LINUX,$(OS)), \
+ -lrt \
+ ) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc$(1)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list