From e9f7c8f37d2d1d079a2e7c3262d9f9e0affba583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 27 Sep 2022 20:49:05 +0200 Subject: [PATCH] VK: XFAIL descriptor pool allocation failure tests on llvmpipe. There it never fails, for some reason. Not sure why, but probably not worth investigating. --- src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp b/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp index 6fdf096b4..cbb65da50 100644 --- a/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp +++ b/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp @@ -184,7 +184,11 @@ void DescriptorPoolVkTest::allocateFail() { /* tryAllocate() should not assert, and should not print anything */ std::ostringstream out; Error redirectError{&out}; - CORRADE_VERIFY(!pool.tryAllocate(layout)); + { + CORRADE_EXPECT_FAIL_IF(device().properties().name().contains("llvmpipe"), + "Mesa llvmpipe never fails an allocation."); + CORRADE_VERIFY(!pool.tryAllocate(layout)); + } CORRADE_COMPARE(out.str(), ""); } { CORRADE_SKIP_IF_NO_ASSERT(); @@ -193,6 +197,8 @@ void DescriptorPoolVkTest::allocateFail() { std::ostringstream out; Error redirectError{&out}; pool.allocate(layout); + CORRADE_EXPECT_FAIL_IF(device().properties().name().contains("llvmpipe"), + "Mesa llvmpipe never fails an allocation."); CORRADE_COMPARE(out.str(), "Vk::DescriptorPool::allocate(): allocation failed with Vk::Result::ErrorOutOfPoolMemory\n"); } } @@ -303,7 +309,11 @@ void DescriptorPoolVkTest::reset() { CORRADE_VERIFY(pool.tryAllocate(layout)); /* Second won't */ - CORRADE_VERIFY(!pool.tryAllocate(layout)); + { + CORRADE_EXPECT_FAIL_IF(device().properties().name().contains("llvmpipe"), + "Mesa llvmpipe never fails an allocation."); + CORRADE_VERIFY(!pool.tryAllocate(layout)); + } pool.reset();