From 2e6dfe6bf391b25fb8afab6cce754be0bf8cf879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 27 Jul 2023 13:42:17 +0200 Subject: [PATCH] GL: this XFAIL is fixed on Mesa 23.1.4. Yay, software getting improved! Always makes me happy. --- src/Magnum/GL/Test/ShaderGLTest.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/GL/Test/ShaderGLTest.cpp b/src/Magnum/GL/Test/ShaderGLTest.cpp index b4a9d7f7d..c6fac232f 100644 --- a/src/Magnum/GL/Test/ShaderGLTest.cpp +++ b/src/Magnum/GL/Test/ShaderGLTest.cpp @@ -481,7 +481,11 @@ void ShaderGLTest::compileFailure() { CORRADE_COMPARE_AS(out.str(), "11", TestSuite::Compare::StringNotContains); { #ifndef MAGNUM_TARGET_WEBGL - CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::Mesa, + /* Fixed in 23.1.4, https://gitlab.freedesktop.org/mesa/mesa/-/commit/d5ff432d7d08c8bb644594ccf28b83be4b521ffe + Since I don't have any builtin way to compare version strings yet, + XFAILing only optionally, if it actually doesn't contain the + string. */ + CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::Mesa && !Containers::StringView{out.str()}.contains("12"), "Mesa reports source number only in some cases."); #endif CORRADE_COMPARE_AS(out.str(), "12", TestSuite::Compare::StringContains);