[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source

[Henry Castro (via logerrit)]

 desktop/source/app/app.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8c2cc1424195ef5049199bcec57d29a662fd0b4a
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Jul 22 11:20:40 2022 -0400
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Wed Aug 3 15:34:04 2022 +0200

    desktop: avoid run graphic tests if ...
    
    DISPLAY=hostname:displaynumber.screennumber has
    defined a remote display server, otherwise the initialization
    stuck for long time.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: Ieb598a023bce3d4298e02fa3ed6ae2bcfc6df015
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137366
    Tested-by: Jenkins
    (cherry picked from commit 554370661554652e7be96034e310d6863c700285)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137613
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b254c927fd10..4683f76e3295 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1562,7 +1562,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();