summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/source/bootstrapfixture.cxx2
-rw-r--r--test/source/setupvcl.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 99fd73151dfb..0808a6d4f9e7 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -92,7 +92,7 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory)
try
{
::comphelper::setProcessServiceFactory(pFactory);
- test::setUpVcl();
+ test::setUpVcl(true); // hard-code python tests to headless
test_init_impl(false, true, pFactory);
}
catch (...) { abort(); }
diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx
index 99f17b7fb056..ff6eec8b8605 100644
--- a/test/source/setupvcl.cxx
+++ b/test/source/setupvcl.cxx
@@ -57,7 +57,7 @@ IMPL_STATIC_LINK_NOARG(Hook, deinitHook, LinkParamNone *, void) {
}
-void test::setUpVcl() {
+void test::setUpVcl(bool const forceHeadless) {
// Force locale (and resource files loaded):
OUString locale;
if (getenv("LO_TEST_LOCALE") != nullptr)
@@ -72,7 +72,7 @@ void test::setUpVcl() {
MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
LanguageTag::setConfiguredSystemLanguage(tag.getLanguageType(false));
InitVCL();
- if (isHeadless()) {
+ if (forceHeadless || isHeadless()) {
Application::EnableHeadlessMode(false);
}
Application::setDeInitHook(LINK(nullptr, Hook, deinitHook));