Kaydet (Commit) e3ce8855 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

CppunitTest --headless is not the same as soffice --headless

...they just "happen" to have the same name

Change-Id: Ia602f9a62e07c3af6fba2ffb84a858e1fb4b09ce
üst 234ff843
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <osl/file.hxx> #include <osl/file.hxx>
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <isheadless.hxx>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <cstring> #include <cstring>
...@@ -100,7 +102,7 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory) ...@@ -100,7 +102,7 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory)
LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US); LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
InitVCL(); InitVCL();
if (Application::IsHeadlessModeRequested()) if (test::isHeadless())
Application::EnableHeadlessMode(true); Application::EnableHeadlessMode(true);
test_init_impl(false, true, pFactory); test_init_impl(false, true, pFactory);
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
#define INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
#include <sal/config.h>
#include <rtl/process.h>
#include <sal/types.h>
namespace test {
inline bool isHeadless() {
sal_uInt32 n = rtl_getAppCommandArgCount();
for (sal_uInt32 i = 0; i != n; ++i) {
OUString arg;
rtl_getAppCommandArg(i, &arg.pData);
if (arg == "--headless") {
return true;
}
}
return false;
}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <unotools/syslocaleoptions.hxx> #include <unotools/syslocaleoptions.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <isheadless.hxx>
namespace { namespace {
class Protector: public CppUnit::Protector, private boost::noncopyable { class Protector: public CppUnit::Protector, private boost::noncopyable {
...@@ -38,7 +40,7 @@ public: ...@@ -38,7 +40,7 @@ public:
MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US); MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US); LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
InitVCL(); InitVCL();
if (Application::IsHeadlessModeRequested()) { if (test::isHeadless()) {
Application::EnableHeadlessMode(true); Application::EnableHeadlessMode(true);
} }
Application::setDeInitHook(STATIC_LINK(this, Protector, deinitHook)); Application::setDeInitHook(STATIC_LINK(this, Protector, 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