Kaydet (Commit) e57462cd authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Mike Kaganski

test: force EnableHeadlessMode() for PythonTest

Clearly this should be on, but we can't easily pass in a command line
argument like is done in CppunitTest because that doesn't end up in
rtl_getAppCommandArg(), which is empty since it's the python.bin process,
so we'd have to find a way to get the argv from python first...

Change-Id: I9321a9f933f388a659643898e0dc38f295f2068c
Reviewed-on: https://gerrit.libreoffice.org/54083Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 36a68825
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
namespace test { namespace test {
// Calls InitVCL etc.; needed from multiple places in the test infrastructure: // Calls InitVCL etc.; needed from multiple places in the test infrastructure:
OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(); OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(bool forceHeadless = false);
} }
......
...@@ -92,7 +92,7 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory) ...@@ -92,7 +92,7 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory)
try try
{ {
::comphelper::setProcessServiceFactory(pFactory); ::comphelper::setProcessServiceFactory(pFactory);
test::setUpVcl(); test::setUpVcl(true); // hard-code python tests to headless
test_init_impl(false, true, pFactory); test_init_impl(false, true, pFactory);
} }
catch (...) { abort(); } catch (...) { abort(); }
......
...@@ -57,7 +57,7 @@ IMPL_STATIC_LINK_NOARG(Hook, deinitHook, LinkParamNone *, void) { ...@@ -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): // Force locale (and resource files loaded):
OUString locale; OUString locale;
if (getenv("LO_TEST_LOCALE") != nullptr) if (getenv("LO_TEST_LOCALE") != nullptr)
...@@ -72,7 +72,7 @@ void test::setUpVcl() { ...@@ -72,7 +72,7 @@ void test::setUpVcl() {
MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false)); MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
LanguageTag::setConfiguredSystemLanguage(tag.getLanguageType(false)); LanguageTag::setConfiguredSystemLanguage(tag.getLanguageType(false));
InitVCL(); InitVCL();
if (isHeadless()) { if (forceHeadless || isHeadless()) {
Application::EnableHeadlessMode(false); Application::EnableHeadlessMode(false);
} }
Application::setDeInitHook(LINK(nullptr, Hook, deinitHook)); Application::setDeInitHook(LINK(nullptr, Hook, deinitHook));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment