sc/CppunitTest_sc_macros_test.mk | 1
sc/CppunitTest_sc_vba_macro_test.mk | 82 ++++++++++++++++++++++++++++++++++++
sc/Module_sc.mk | 1
sc/qa/extras/vba-macro-test.cxx | 2
4 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit a55812aa84a9b416d181ff70d22b86435a4ac5af
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 15 09:15:03 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 15 11:17:33 2022 +0200
CppunitTest_sc_macros_test: split it into two
The .cxx are already separated, use a different
makefile for vba-macro-test.cxx
This might help to mitigate the CppunitTest_sc_macros_test
failure happening in Jenkins on Windows
Change-Id: I5708de3527041a5fcb33287f75f0e14642a88c4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135862
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index f5dabb960015..a6dd427cde67 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -19,7 +19,6 @@ $(eval $(call
gb_CppunitTest_use_common_precompiled_header,sc_macros_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \
sc/qa/extras/macros-test \
- sc/qa/extras/vba-macro-test \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
diff --git a/sc/CppunitTest_sc_vba_macro_test.mk
b/sc/CppunitTest_sc_vba_macro_test.mk
new file mode 100644
index 000000000000..e648d1240213
--- /dev/null
+++ b/sc/CppunitTest_sc_vba_macro_test.mk
@@ -0,0 +1,82 @@
+# -*- 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,sc_vba_macro_test))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_vba_macro_test, \
+ boost_headers \
+ mdds_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_vba_macro_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_vba_macro_test, \
+ sc/qa/extras/vba-macro-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_vba_macro_test, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ drawinglayercore \
+ editeng \
+ for \
+ forui \
+ i18nlangtag \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sax \
+ sb \
+ sc \
+ scqahelper \
+ sfx \
+ sot \
+ subsequenttest \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ test \
+ tk \
+ tl \
+ ucbhelper \
+ unotest \
+ utl \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
+ vcl \
+ xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_vba_macro_test,\
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/inc \
+ -I$(SRCDIR)/sc/qa/unit \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_vba_macro_test,\
+ offapi \
+ oovbaapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_vba_macro_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_vba_macro_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_vba_macro_test,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_vba_macro_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6dde171ebdc8..5cea4b59d426 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_subsequent_export_test \
CppunitTest_sc_subsequent_export_test2 \
CppunitTest_sc_uicalc \
+ CppunitTest_sc_vba_macro_test \
))
ifneq ($(ENABLE_JUMBO_SHEETS),)
diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index 78f5b1c3f4b2..cb39490d29ae 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -781,4 +781,6 @@ void VBAMacroTest::testTdf149531()
}
CPPUNIT_TEST_SUITE_REGISTRATION(VBAMacroTest);
+CPPUNIT_PLUGIN_IMPLEMENT();
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
