From 8add2f4d86e546e8000a0fed65a5b96db5c9dc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 4 Jun 2018 20:29:25 +0200 Subject: [PATCH] GL: make spurious test failures with queries more bearable. The XFAIL can be disabled globally, if needed. --- src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp | 5 ++++- src/Magnum/GL/Test/SampleQueryGLTest.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp index d4a22aad8..e5ea856a1 100644 --- a/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp +++ b/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp @@ -169,7 +169,10 @@ void PrimitiveQueryGLTest::primitivesGenerated() { const bool availableAfter = q.resultAvailable(); MAGNUM_VERIFY_NO_GL_ERROR(); - CORRADE_VERIFY(!availableBefore); + { + CORRADE_EXPECT_FAIL_IF(availableBefore, "GPU faster than light?"); + CORRADE_VERIFY(!availableBefore); + } CORRADE_VERIFY(availableAfter); CORRADE_COMPARE(count, 3); } diff --git a/src/Magnum/GL/Test/SampleQueryGLTest.cpp b/src/Magnum/GL/Test/SampleQueryGLTest.cpp index f2494406e..785d76282 100644 --- a/src/Magnum/GL/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/GL/Test/SampleQueryGLTest.cpp @@ -194,7 +194,10 @@ void SampleQueryGLTest::querySamplesPassed() { const bool availableAfter = q.resultAvailable(); MAGNUM_VERIFY_NO_GL_ERROR(); - CORRADE_VERIFY(!availableBefore); + { + CORRADE_EXPECT_FAIL_IF(availableBefore, "GPU faster than light?"); + CORRADE_VERIFY(!availableBefore); + } CORRADE_VERIFY(availableAfter); #ifndef MAGNUM_TARGET_GLES CORRADE_COMPARE(count, 32*32);