From 92af70732ba8534a08e99ec9d5461d70291e7adb Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Fri, 11 May 2018 09:47:00 +0100 Subject: Revert "Set SAL_USE_VCLPLUGIN=svp on all platforms to define headless mode" This reverts commit c0965754df3309c39d316b76b2205af559bd28e3 since its reason was fixed in commits e57462cd7b08df2794b1c81e7bb15ed96afef1f1 and 752a1e27246e768984fed43153f3327379b76c99. Change-Id: I7b41888a9192c842b7df151be0ed3c6cf92d6322 Reviewed-on: https://gerrit.libreoffice.org/54123 Reviewed-by: Michael Stahl Tested-by: Jenkins --- solenv/gbuild/PythonTest.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 6ac8ba63fda1..9b0590e35d2a 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 $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ SAL_USE_VCLPLUGIN=svp \ - ) \ + )) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ $(gb_PythonTest_COMMAND) \ $(if $(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \ -- cgit