summaryrefslogtreecommitdiff
path: root/desktop/source/app/app.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/app/app.cxx')
-rw-r--r--desktop/source/app/app.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b254c927fd10..1caad5299ff5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -82,6 +82,7 @@
#include <desktop/exithelper.h>
#include <sal/log.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/configuration.hxx>
#include <comphelper/fileurl.hxx>
#include <comphelper/threadpool.hxx>
@@ -341,6 +342,8 @@ namespace {
void runGraphicsRenderTests()
{
+ if (comphelper::LibreOfficeKit::isActive())
+ return;
if (!utl::isProductVersionUpgraded(false))
{
return;
@@ -1562,7 +1565,11 @@ int Desktop::Main()
#endif
//Running the VCL graphics rendering tests
- runGraphicsRenderTests();
+ const char * pDisplay = std::getenv("DISPLAY");
+ if (!pDisplay || pDisplay[0] == ':')
+ {
+ runGraphicsRenderTests();
+ }
// Reap the process started by fire_glxtest_process().
reap_glxtest_process();