solenv/gbuild/CppunitTest.mk | 4 ++--
solenv/gbuild/Gallery.mk | 3 ---
solenv/gbuild/PythonTest.mk | 3 ---
solenv/gbuild/UITest.mk | 3 ---
solenv/gbuild/gbuild.mk | 3 +++
vcl/source/app/salplug.cxx | 6 +++---
6 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 2edc86a592bc943fcffef0a8ae8db220e18e2b37
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Fri Nov 23 13:44:28 2018 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Dec 6 17:41:53 2018 +0100
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 <glo...@fbihome.de>
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 283ea290d04a..d7e63888a660 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -122,8 +122,8 @@ else
( \
$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ;
do LO_TEST_LOCALE="$$l" ) \
$(if
$(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \
- $(gb_TEST_ENV_VARS) \
- $(if $(gb_CppunitTest__vcl_no_svp),,SAL_USE_VCLPLUGIN=$(or
$(SAL_USE_VCLPLUGIN),svp)) \
+ $(if $(gb_CppunitTest__vcl_no_svp), \
+ $(filter
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \
$(if $(filter
gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index ef8dcc65cee5..17569a626e6f 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -20,9 +20,6 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
RESPONSEFILE=$(call var2file,$(shell $(call
gb_MKTEMP)),100,$(GALLERY_FILES)) && \
$(call gb_Helper_print_on_error,\
- $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if
$(DISABLE_GUI),, \
- SAL_USE_VCLPLUGIN=svp \
- )) \
$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
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)) \
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index d3946626ac69..858dfabba65e 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -70,9 +70,6 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_UITest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=0 \
$(gb_TEST_ENV_VARS) \
- $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if
$(DISABLE_GUI),, \
- SAL_USE_VCLPLUGIN=svp \
- )) \
$(gb_UITest_COMMAND) \
--soffice="$(gb_UITest_SOFFICEARG)" \
--userdir=$(call gb_Helper_make_url,$(dir $(call
gb_UITest_get_target,$*))user) \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8760c4d69ca6..222742293e2d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -248,6 +248,9 @@ gb_TEST_ENV_VARS := MAX_CONCURRENCY=4
gb_TEST_ENV_VARS += MOZILLA_CERTIFICATE_FOLDER=0
# Avoid hanging if the cups daemon requests a password:
gb_TEST_ENV_VARS += SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1
+ifeq (,$(SAL_USE_VCLPLUGIN))
+gb_TEST_ENV_VARS += SAL_USE_VCLPLUGIN=svp
+endif
# This is used to detect whether LibreOffice is being built (as opposed to
building
# 3rd-party code). Used for tag deprecation for API we want to
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 205f5dae0526..3a3421179274 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -236,12 +236,12 @@ SalInstance *CreateSalInstance()
SalInstance *pInst = nullptr;
OUString aUsePlugin;
+ rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", aUsePlugin);
+ SAL_INFO_IF(!aUsePlugin.isEmpty(), "vcl", "Requested VCL plugin: " <<
aUsePlugin);
#ifdef HEADLESS_VCLPLUG
- if( IsHeadlessModeRequested() )
+ if (Application::IsBitmapRendering() || (aUsePlugin.isEmpty() &&
IsHeadlessModeRequested()))
aUsePlugin = "svp";
- else
#endif
- rtl::Bootstrap::get( "SAL_USE_VCLPLUGIN", aUsePlugin );
if (aUsePlugin == "svp")
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
