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

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

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

New commits:
commit 5ae845923499422540632456f1dafefa3ad49f4f
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Sep 28 16:05:38 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri Oct 2 15:43:14 2020 +0200

    opt-out from checking vclbackendtest failures rather than opt-in
    
    So that the default is checking, and if a VCL backend doesn't work
    correctly (which is most of them now), then that should need
    special-casing.
    
    Change-Id: If55b09cfd64abe5f0efd798d91c303936ec0989b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103785
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index 1342c3a5ade9..ff495b10c1de 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -18,6 +18,7 @@
 
 #include <test/outputdevice.hxx>
 
+// Run tests from visualbackendtest ('bin/run visualbackendtest').
 class BackendTest : public test::BootstrapFixture
 {
     // if enabled - check the result images with:
@@ -72,16 +73,26 @@ public:
         // This ensures that all backends return a valid name.
         assert(!name.isEmpty());
         (void)name;
-        return false;
+        return true;
     }
 
 // Check whether tests should fail depending on which backend is used
 // (not all work). If you want to disable just a specific test
 // for a specific backend, use something like
 // 'if(SHOULD_ASSERT && aOutDevTest.getRenderBackendName() != "skia")'.
+// The macro uses opt-out rather than opt-in so that this doesn't "pass"
+// silently in case a new backend is added.
 #define SHOULD_ASSERT                                                                              \
     (assertBackendNameNotEmpty(aOutDevTest.getRenderBackendName())                                 \
-     || aOutDevTest.getRenderBackendName() == "skia")
+     && aOutDevTest.getRenderBackendName() != "svp"                                                \
+     && aOutDevTest.getRenderBackendName() != "opengl"                                             \
+     && aOutDevTest.getRenderBackendName() != "qt5"                                                \
+     && aOutDevTest.getRenderBackendName() != "qt5svp"                                             \
+     && aOutDevTest.getRenderBackendName() != "gtk3svp"                                            \
+     && aOutDevTest.getRenderBackendName() != "aqua"                                               \
+     && aOutDevTest.getRenderBackendName() != "gen"                                                \
+     && aOutDevTest.getRenderBackendName() != "genpsp"                                             \
+     && aOutDevTest.getRenderBackendName() != "win")
 
     void testDrawRectWithRectangle()
     {