[Libreoffice-commits] core.git: vcl/qa

[Luboš Luňák (via logerrit)]

 vcl/qa/cppunit/BackendTest.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 88fdc3cd5eb6c88d2649f01f91bf7acd703e6364
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Nov 14 11:11:45 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 14 22:25:34 2020 +0100

    enable vcl backendtest unittest for headless too
    
    This test would have caught the SalPoint mismatch from 3d90997fb6f232
    causing gradient problems, if only this were enabled for headless too.
    So explicitly disable only the two invert() tests.
    
    Change-Id: Ib6f6a8c8cd9675ca6d20a761ebebdbc8ef0ebd45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105832
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index ff495b10c1de..94bf1e142960 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -84,7 +84,6 @@ public:
 // silently in case a new backend is added.
 #define SHOULD_ASSERT                                                                              \
     (assertBackendNameNotEmpty(aOutDevTest.getRenderBackendName())                                 \
-     && aOutDevTest.getRenderBackendName() != "svp"                                                \
      && aOutDevTest.getRenderBackendName() != "opengl"                                             \
      && aOutDevTest.getRenderBackendName() != "qt5"                                                \
      && aOutDevTest.getRenderBackendName() != "qt5svp"                                             \
@@ -373,7 +372,7 @@ public:
         Bitmap aBitmap = aOutDevTest.setupInvert_N50();
         auto eResult = vcl::test::OutputDeviceTestCommon::checkInvertN50Rectangle(aBitmap);
         exportImage("05-02_invert_N50_test-rectangle.png", aBitmap);
-        if (SHOULD_ASSERT)
+        if (SHOULD_ASSERT && aOutDevTest.getRenderBackendName() != "svp")
             CPPUNIT_ASSERT(eResult != vcl::test::TestResult::Failed);
     }
 
@@ -383,7 +382,7 @@ public:
         Bitmap aBitmap = aOutDevTest.setupInvert_TrackFrame();
         auto eResult = vcl::test::OutputDeviceTestCommon::checkInvertTrackFrameRectangle(aBitmap);
         exportImage("05-03_invert_TrackFrame_test-rectangle.png", aBitmap);
-        if (SHOULD_ASSERT)
+        if (SHOULD_ASSERT && aOutDevTest.getRenderBackendName() != "svp")
             CPPUNIT_ASSERT(eResult != vcl::test::TestResult::Failed);
     }