summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-09-28 16:05:38 +0200
committerLuboš Luňák <l.lunak@collabora.com>2020-10-02 15:43:14 +0200
commit5ae845923499422540632456f1dafefa3ad49f4f (patch)
treee38af6b96691bf89bf2bf42f1b4a39e8bad8e22f
parent5acdb23a413ce82a279eb4fee0ddf867e989fec8 (diff)
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@collabora.com>
-rw-r--r--vcl/qa/cppunit/BackendTest.cxx15
1 files changed, 13 insertions, 2 deletions
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()
{