summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-05-10 10:08:47 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2018-05-10 14:06:07 +0200
commitc0965754df3309c39d316b76b2205af559bd28e3 (patch)
tree4d8b5032723da351d4ea46c14b46e68ed79d5b14 /solenv
parent447c40948eab930b4617f905f2722f926c3b7b36 (diff)
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.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/PythonTest.mk4
1 files changed, 2 insertions, 2 deletions
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)) \