diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-23 13:44:28 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-06 17:41:53 +0100 |
| commit | 2edc86a592bc943fcffef0a8ae8db220e18e2b37 (patch) | |
| tree | 943090617fc9bd5f369ea1894fa8ce96972d99b9 /vcl | |
| parent | 86f5f598a2bdd71f95921c20e0361dee54b266c1 (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 'vcl')
| -rw-r--r-- | vcl/source/app/salplug.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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") { |