From 407f01997748b0f5ed05f5eb6f6596d11921e395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 7 Jan 2016 17:56:45 +0100 Subject: [PATCH] Make the XFAIL in Mesh GL test more restrictive. Surprisingly OSX drivers are the only ones that are doing it right?! --- src/Magnum/Test/MeshGLTest.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp index e8e74cc89..1cff747f6 100644 --- a/src/Magnum/Test/MeshGLTest.cpp +++ b/src/Magnum/Test/MeshGLTest.cpp @@ -795,13 +795,14 @@ void MeshGLTest::addVertexBufferMatrixNxNd() { MAGNUM_VERIFY_NO_ERROR(); { - CORRADE_EXPECT_FAIL("Somehow only first two values are extracted"); + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::AMD|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted"); CORRADE_COMPARE(value, Math::Vector3(315, 65201, 2576)); } /* This is wrong, but check if it's still the right wrong. Fails on AMD 15.201.1151 but seems to be fixed in 15.300.1025.0 */ - CORRADE_COMPARE(value, Math::Vector3(315, 65201, 0)); + if(Context::current().detectedDriver() & (Context::DetectedDriver::AMD|Context::DetectedDriver::NVidia)) + CORRADE_COMPARE(value, Math::Vector3(315, 65201, 0)); } #endif @@ -860,13 +861,14 @@ void MeshGLTest::addVertexBufferMatrixMxNd() { MAGNUM_VERIFY_NO_ERROR(); { - CORRADE_EXPECT_FAIL("Somehow only first two values are extracted"); + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & (Context::DetectedDriver::AMD|Context::DetectedDriver::NVidia), "Somehow only first two values are extracted"); CORRADE_COMPARE(value, Math::Vector3(315, 65201, 2576)); } /* This is wrong, but check if it's still the right wrong. Fails on AMD 15.201.1151 but seems to be fixed in 15.300.1025.0 */ - CORRADE_COMPARE(value, Math::Vector3(315, 65201, 0)); + if(Context::current().detectedDriver() & (Context::DetectedDriver::AMD|Context::DetectedDriver::NVidia)) + CORRADE_COMPARE(value, Math::Vector3(315, 65201, 0)); } #endif