sw/CppunitTest_sw_core_draw.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
New commits: commit 012875da5bb23e2c90e9cb6132c4b36a7f56648a Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Tue Nov 8 16:34:55 2022 +0300 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Tue Nov 8 16:27:28 2022 +0100 Add missing dependency Without this, running `make CppunitTest_sw_core_draw` after `make clean` will stop at "GpgME not installed correctly" dialog, because DocumentSignatureManager::init will try to initialize GPG security context, which requires gpgme-w32spawn.exe to be present in workdir/LinkTarget/Executable. Interestingly, in case of this specific test, it passes OK after dismissing the dialog; so arguably a better fix would be to change a test document to avoid DocumentSignatureManager initialization; but I opted for a simpler workaround. See also commit 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb. Change-Id: If1e326733568d6b262d28308bc9bc04078084170 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142458 Tested-by: Mike Kaganski <mike.kagan...@collabora.com> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/CppunitTest_sw_core_draw.mk b/sw/CppunitTest_sw_core_draw.mk index 7e38fbce1386..acd065c01b4e 100644 --- a/sw/CppunitTest_sw_core_draw.mk +++ b/sw/CppunitTest_sw_core_draw.mk @@ -71,4 +71,12 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_draw, \ $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_draw)) +ifeq ($(OS),WNT) +# Initializing DocumentSignatureManager will require gpgme-w32spawn.exe in workdir/LinkTarget/Executable +# In fact, it is not even required to complete test successfully, but the dialog would stop execution +$(eval $(call gb_CppunitTest_use_packages,sw_core_draw,\ + $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ +)) +endif + # vim: set noet sw=4 ts=4: