[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk

[Stephan Bergmann (via logerrit)]

 postprocess/CppunitTest_services.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit aa72601c8ce40c5e3bb3caae54522afaa83f0684
Author: Stephan Bergmann 
AuthorDate: Thu Feb 6 22:26:17 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 7 08:20:28 2020 +0100

Missing test dependencies

First, there was a SIGABRT due to

> Could not find platform independent libraries 
> Could not find platform dependent libraries 
> Consider setting $PYTHONHOME to [:]
> Fatal Python error: initfsencoding: Unable to get the locale encoding
> ModuleNotFoundError: No module named 'encodings'

at

> #1  0x76ddc8d9 in __GI_abort ()
> #2  0x7ffd654459db in fatal_error (prefix=, 
msg=, status=) at 
workdir/UnpackedTarball/python3/Python/pylifecycle.c:2187
> #3  0x7ffd654430fe in _Py_FatalInitError (err=...) at 
workdir/UnpackedTarball/python3/Python/pylifecycle.c:2206
> #4  0x7ffd65443348 in Py_InitializeEx (install_sigs=1) at 
workdir/UnpackedTarball/python3/Python/pylifecycle.c:1041
> #5  Py_Initialize () at 
workdir/UnpackedTarball/python3/Python/pylifecycle.c:1048
> #6  0x7ffd65d88a65 in pyuno_loader::(anonymous 
namespace)::PythonInit::PythonInit() (this=0x7ffd65da0820 

 const&)::s_Init>) at pyuno/source/loader/pyuno_loader.cxx:229
> #7  0x7ffd65d87b54 in 
pyuno_loader::CreateInstance(com::sun::star::uno::Reference
 const&) (ctx=...) at pyuno/source/loader/pyuno_loader.cxx:247

And then there was a failure

> postprocess/qa/services.cxx:318:(anonymous namespace)::Test::test
> forced failure
> - instantiating "com.sun.star.wizards.agenda.CallWizard" via 
"com.sun.star.wizards.agenda.CallWizard"  caused 
com.sun.star.uno.RuntimeException ": No module named 
'wizards.ui' (or 'ui.WizardDialog.WizardDialog' is unknown), traceback follows
>   File "instdir/program/pythonloader.py", line 136, in activate
> mod = self.getModuleFromUrl( locationUrl )
>   File "instdir/program/pythonloader.py", line 114, in getModuleFromUrl
> mod =  __import__( dependent )
>   File "instdir/program/uno.py", line 356, in _uno_import
> return _builtin_import(name, *optargs, **kwargs)
>   File "instdir/program/wizards/agenda/CallWizard.py", line 21, in 

> from .AgendaWizardDialogImpl import AgendaWizardDialogImpl, Desktop
>   File "instdir/program/uno.py", line 356, in _uno_import
> return _builtin_import(name, *optargs, **kwargs)
>   File "instdir/program/wizards/agenda/AgendaWizardDialogImpl.py", line 
20, in 
> from .AgendaWizardDialog import AgendaWizardDialog, uno
>   File "instdir/program/uno.py", line 356, in _uno_import
> return _builtin_import(name, *optargs, **kwargs)
>   File "instdir/program/wizards/agenda/AgendaWizardDialog.py", line 18, 
in 
> from ..ui.WizardDialog import WizardDialog, uno, UIConsts, 
PropertyNames
>   File "instdir/program/uno.py", line 434, in _uno_import
> raise uno_import_exc
>   File "instdir/program/uno.py", line 356, in _uno_import
> return _builtin_import(name, *optargs, **kwargs)
>
> "

Change-Id: I80160dccd162641e6a9d5633e45a498f230abfdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88144
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index c0726f973da0..cd02461fb9a4 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -38,6 +38,12 @@ ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_CppunitTest_use_python_ure,services))
 
 $(eval $(call gb_CppunitTest_use_rdb,services,pyuno))
+
+$(eval $(call gb_CppunitTest_use_packages,services, \
+   pyuno_pythonloader_ini \
+))
+
+$(call gb_CppunitTest_get_target,services): $(call 
gb_Pyuno_get_target,commonwizards)
 endif
 
 $(eval $(call gb_CppunitTest_use_configuration,services))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk solenv/gbuild

[Stephan Bergmann (via logerrit)]

 postprocess/CppunitTest_services.mk |2 --
 solenv/gbuild/CppunitTest.mk|4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f3f5e11682b0392b4e750ec014c399051a5fe27c
Author: Stephan Bergmann 
AuthorDate: Thu Feb 6 19:46:09 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 6 22:23:52 2020 +0100

gb_CppunitTest__use_java_ure can be private again

...(which it already was until 1f6e670605cc856a6e9febb024f9cb2427156020 
"gbuild:
require java UNO runtime explicitly"), as
2a87b3b5aed8296a7506374fd5324c5659a88cb5 made that implicitly called from
gb_CppunitTest_use_jar(s), so its (sole outside) use in
postprocess/CppunitTest_services.mk is redundant

Change-Id: I9928521d184c54688de134ff3b9b5743ba3509c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88134
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index 9371443b5d6a..c0726f973da0 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -43,8 +43,6 @@ endif
 $(eval $(call gb_CppunitTest_use_configuration,services))
 
 ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_CppunitTest_use_java_ure,services))
-
 $(eval $(call gb_CppunitTest_use_jars,services,\
ScriptProviderForJava \
smoketest \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d914cf83faaa..1eb954c4242d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -372,7 +372,7 @@ endif
 
 endef
 
-define gb_CppunitTest_use_java_ure
+define gb_CppunitTest__use_java_ure
 $(call gb_CppunitTest_get_target,$(1)) : \
 $(foreach jar,java_uno juh ridl unoloader,$(call 
gb_Jar_get_target,$(jar))) \
 $(call gb_Library_get_target,affine_uno_uno) \
@@ -389,7 +389,7 @@ $(call gb_CppunitTest_get_target,$(1)) : \
 endef
 
 define gb_CppunitTest_use_jar
-$(call gb_CppunitTest_use_java_ure,$(1))
+$(call gb_CppunitTest__use_java_ure,$(1))
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk postprocess/qa pyuno/source reportdesign/source sax/source

[Arkadiy Illarionov (via logerrit)]

 postprocess/CppunitTest_services.mk |1 
 postprocess/qa/services.cxx |   54 
 pyuno/source/module/pyuno_adapter.cxx   |   38 ++--
 reportdesign/source/core/api/ReportDefinition.cxx   |   21 +---
 reportdesign/source/core/sdr/RptObject.cxx  |   11 +-
 reportdesign/source/filter/xml/xmlExport.cxx|7 -
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |   12 +-
 reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |9 --
 reportdesign/source/filter/xml/xmlfilter.cxx|   28 ++
 reportdesign/source/ui/dlg/AddField.cxx |   18 +---
 reportdesign/source/ui/dlg/DateTime.cxx |6 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx|   18 +---
 reportdesign/source/ui/dlg/Navigator.cxx|6 -
 reportdesign/source/ui/inspection/GeometryHandler.cxx   |8 -
 reportdesign/source/ui/misc/RptUndo.cxx |   10 --
 reportdesign/source/ui/report/ReportController.cxx  |   27 ++
 reportdesign/source/ui/report/ReportSection.cxx |   17 +--
 reportdesign/source/ui/report/ViewsWindow.cxx   |   14 +--
 sax/source/expatwrap/xml2utf.cxx|   11 --
 sax/source/fastparser/fastparser.cxx|7 -
 sax/source/fastparser/legacyfastparser.cxx  |   18 +---
 sax/source/tools/fastserializer.cxx |4 
 22 files changed, 132 insertions(+), 213 deletions(-)

New commits:
commit edcdfe5477559ca6c62897f0cad47d4d6149d77a
Author: Arkadiy Illarionov 
AuthorDate: Sat Aug 10 19:07:30 2019 +0300
Commit: Arkadiy Illarionov 
CommitDate: Sat Aug 17 14:08:33 2019 +0200

Simplify Sequence iterations in postprocess..sax

Use range-based loops, STL and comphelper functions

Change-Id: If738d8f4e792c4686870183b0c0fdfbb61fd3351
Reviewed-on: https://gerrit.libreoffice.org/77245
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov 

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index d886cb4961d8..9371443b5d6a 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,services, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,services, \
+   comphelper \
cppu \
cppuhelper \
sal \
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index a807a037e80e..3c0fa8f7c6cf 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -77,12 +78,7 @@ bool unique(css::uno::Sequence const & strings) {
 bool contains(
 css::uno::Sequence const & strings, OUString const & string)
 {
-for (sal_Int32 i = 0; i != strings.getLength(); ++i) {
-if (string == strings[i]) {
-return true;
-}
-}
-return false;
+return comphelper::findValue(strings, string) != -1;
 }
 
 bool contains(
@@ -90,12 +86,8 @@ bool contains(
 css::uno::Sequence const & strings2)
 {
 // Assumes small sequences for which quadratic algorithm is acceptable:
-for (sal_Int32 i = 0; i != strings2.getLength(); ++i) {
-if (!contains(strings1, strings2[i])) {
-return false;
-}
-}
-return true;
+return std::all_of(strings2.begin(), strings2.end(),
+[](const OUString& rStr) { return contains(strings1, rStr); 
});
 }
 
 void addService(
@@ -157,7 +149,7 @@ void Test::test() {
 m_xContext->getValueByName(
 "/singletons/com.sun.star.reflection.theTypeDescriptionManager"),
 css::uno::UNO_QUERY_THROW);
-css::uno::Sequence serviceNames(
+const css::uno::Sequence serviceNames(
 m_xContext->getServiceManager()->getAvailableServiceNames());
 struct Constructor {
 Constructor(
@@ -181,9 +173,9 @@ void Test::test() {
 bool accumulationBased;
 };
 std::map impls;
-for (sal_Int32 i = 0; i != serviceNames.getLength(); ++i) {
+for (const auto& rServiceName : serviceNames) {
 css::uno::Reference serviceImpls1(
-enumAcc->createContentEnumeration(serviceNames[i]),
+enumAcc->createContentEnumeration(rServiceName),
 css::uno::UNO_SET_THROW);
 std::vector> 
serviceImpls2;
 while (serviceImpls1->hasMoreElements()) {
@@ -191,9 +183,9 @@ void Test::test() {
 serviceImpls1->nextElement(), css::uno::UNO_QUERY_THROW);
 }
 css::uno::Reference desc;
-if (typeMgr->hasByHierarchicalName(serviceNames[i])) {
+if (typeMgr->hasByHierarchicalName(rServiceName)) {
 desc.set(
-

[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk

[Stephan Bergmann]

 postprocess/CppunitTest_services.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b328acbd3a427c4e9e69c081dde4298bd1e775d
Author: Stephan Bergmann 
Date:   Tue Jan 19 10:42:34 2016 +0100

Missing dependency

Change-Id: Icd867709d9d41a9ea1846d2f6332dd6988241efb

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index a0e5749..23df019 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -45,6 +45,7 @@ ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_CppunitTest_use_java_ure,services))
 
 $(eval $(call gb_CppunitTest_use_jars,services,\
+   ScriptProviderForJava \
smoketest \
 ))
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk

[Matúš Kukan]

 postprocess/CppunitTest_services.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5888cb101f63d271870a7a392bb35b90a8461af0
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Wed Dec 18 07:24:06 2013 +0100

missing boost_headers external

Change-Id: Ib30dddbc1b105c89c5882f5f857dc20134eca7e6

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index f6da8f6..c80f251 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,services, 
\
 postprocess/qa/services \
 ))
 
+$(eval $(call gb_CppunitTest_use_externals,services, \
+   boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_use_libraries,services, \
cppu \
sal \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits