summaryrefslogtreecommitdiff
path: root/solenv/gbuild/PythonTest.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-11-23 13:44:28 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2018-12-06 17:41:53 +0100
commit2edc86a592bc943fcffef0a8ae8db220e18e2b37 (patch)
tree943090617fc9bd5f369ea1894fa8ce96972d99b9 /solenv/gbuild/PythonTest.mk
parent86f5f598a2bdd71f95921c20e0361dee54b266c1 (diff)
Default all tests to run with the svp plugin
Otherwise a test can already require a windowed VCL plugin by calling gb_CppunitTest_use_vcl_non_headless(_with_windows)?. For compatibility on unix --headless still implies the use of the svp plugin, but now a SAL_USE_VCLPLUGIN will override it. All the explicit SAL_USE_VCLPLUGIN=svp are not needed, as this is now included in the gb_TEST_ENV_VARS variable and gengal already calls Application::EnableConsoleOnly(). Change-Id: I6b4e75282aa88d747db87d60ffe6c8f282187c5f Reviewed-on: https://gerrit.libreoffice.org/64052 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv/gbuild/PythonTest.mk')
-rw-r--r--solenv/gbuild/PythonTest.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 6460f408410a..07bbf7f397d8 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -56,9 +56,6 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
- $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \
- SAL_USE_VCLPLUGIN=svp \
- )) \
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_PythonTest_COMMAND) \
$(if $(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \