[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 <sbergman at redhat.com>
AuthorDate: Thu Feb 6 22:26:17 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
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 <prefix>
    > Could not find platform dependent libraries <exec_prefix>
    > Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]
    > Fatal Python error: initfsencoding: Unable to get the locale encoding
    > ModuleNotFoundError: No module named 'encodings'
    
    at
    
    > #1  0x00007ffff6ddc8d9 in __GI_abort ()
    > #2  0x00007ffd654459db in fatal_error (prefix=<optimized out>, msg=<optimized out>, status=<optimized out>) at workdir/UnpackedTarball/python3/Python/pylifecycle.c:2187
    > #3  0x00007ffd654430fe in _Py_FatalInitError (err=...) at workdir/UnpackedTarball/python3/Python/pylifecycle.c:2206
    > #4  0x00007ffd65443348 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  0x00007ffd65d88a65 in pyuno_loader::(anonymous namespace)::PythonInit::PythonInit() (this=0x7ffd65da0820 <pyuno_loader::CreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)::s_Init>) at pyuno/source/loader/pyuno_loader.cxx:229
    > #7  0x00007ffd65d87b54 in pyuno_loader::CreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> 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 "<class 'ImportError'>: 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 <module>
    >     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 <module>
    >     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 <module>
    >     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 <sbergman at redhat.com>

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))