solenv/gbuild/PythonTest.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c0965754df3309c39d316b76b2205af559bd28e3
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Thu May 10 10:08:47 2018 +0100
Set SAL_USE_VCLPLUGIN=svp on all platforms to define headless mode
... as used now in ODatabaseSource::buildLowLevelConnection; so not
having it on Windows/macOS makes it hang waiting for dialog (e.g., in
fdo84315).
Change-Id: Ia63921ae398eddcd1be7d23e75c85979109a6615
Reviewed-on: https://gerrit.libreoffice.org/54068
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 9b0590e35d2a..6ac8ba63fda1 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -52,9 +52,9 @@ else
UserInstallation=$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*))user) \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
- $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if
$(ENABLE_HEADLESS),, \
+ $(if $(ENABLE_HEADLESS),, \
SAL_USE_VCLPLUGIN=svp \
- )) \
+ ) \
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \
$(gb_PythonTest_COMMAND) \
$(if
$(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
