diff --git a/src/Magnum/GL/Test/PixelFormatTest.cpp b/src/Magnum/GL/Test/PixelFormatTest.cpp index ec39b6037..4a63a526c 100644 --- a/src/Magnum/GL/Test/PixelFormatTest.cpp +++ b/src/Magnum/GL/Test/PixelFormatTest.cpp @@ -139,27 +139,39 @@ void PixelFormatTest::mapFormatTypeTextureFormat() { ++nextHandled; \ continue; #define _n(format, expectedFormat, expectedType) \ - case Magnum::PixelFormat::format: \ + case Magnum::PixelFormat::format: { \ CORRADE_COMPARE(nextHandled, i); \ CORRADE_COMPARE(firstUnhandled, 0xffff); \ CORRADE_VERIFY(hasPixelFormat(Magnum::PixelFormat::format)); \ CORRADE_COMPARE(pixelFormat(Magnum::PixelFormat::format), Magnum::GL::PixelFormat::expectedFormat); \ CORRADE_COMPARE(pixelType(Magnum::PixelFormat::format), Magnum::GL::PixelType::expectedType); \ CORRADE_VERIFY(!hasTextureFormat(Magnum::PixelFormat::format)); \ - textureFormat(Magnum::PixelFormat::format); \ + std::ostringstream out; \ + { /* Redirected otherwise graceful assert would abort */ \ + Error redirectError{&out}; \ + textureFormat(Magnum::PixelFormat::format); \ + } \ + Debug{Debug::Flag::NoNewlineAtTheEnd} << out.str(); \ ++nextHandled; \ - continue; + continue; \ + } #define _s(format) \ - case Magnum::PixelFormat::format: \ + case Magnum::PixelFormat::format: { \ CORRADE_COMPARE(nextHandled, i); \ CORRADE_COMPARE(firstUnhandled, 0xffff); \ CORRADE_VERIFY(!hasPixelFormat(Magnum::PixelFormat::format)); \ CORRADE_VERIFY(!hasTextureFormat(Magnum::PixelFormat::format)); \ - pixelFormat(Magnum::PixelFormat::format); \ - pixelType(Magnum::PixelFormat::format); \ - textureFormat(Magnum::PixelFormat::format); \ + std::ostringstream out; \ + { /* Redirected otherwise graceful assert would abort */ \ + Error redirectError{&out}; \ + pixelFormat(Magnum::PixelFormat::format); \ + pixelType(Magnum::PixelFormat::format); \ + textureFormat(Magnum::PixelFormat::format); \ + } \ + Debug{Debug::Flag::NoNewlineAtTheEnd} << out.str(); \ ++nextHandled; \ - continue; + continue; \ + } #include "Magnum/GL/Implementation/pixelFormatMapping.hpp" #undef _s #undef _n @@ -348,15 +360,21 @@ void PixelFormatTest::mapCompressedFormatTextureFormat() { ++nextHandled; \ continue; #define _s(format) \ - case Magnum::CompressedPixelFormat::format: \ + case Magnum::CompressedPixelFormat::format: { \ CORRADE_COMPARE(nextHandled, i); \ CORRADE_COMPARE(firstUnhandled, 0xffff); \ CORRADE_VERIFY(!hasCompressedPixelFormat(Magnum::CompressedPixelFormat::format)); \ CORRADE_VERIFY(!hasTextureFormat(Magnum::CompressedPixelFormat::format)); \ - compressedPixelFormat(Magnum::CompressedPixelFormat::format); \ - textureFormat(Magnum::CompressedPixelFormat::format); \ + std::ostringstream out; \ + { /* Redirected otherwise graceful assert would abort */ \ + Error redirectError{&out}; \ + compressedPixelFormat(Magnum::CompressedPixelFormat::format); \ + textureFormat(Magnum::CompressedPixelFormat::format); \ + } \ + Debug{Debug::Flag::NoNewlineAtTheEnd} << out.str(); \ ++nextHandled; \ - continue; + continue; \ + } #include "Magnum/GL/Implementation/compressedPixelFormatMapping.hpp" #undef _s #undef _c diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp index 7166629eb..606949657 100644 --- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp +++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp @@ -254,7 +254,7 @@ void ObjectTest::transformations() { } void ObjectTest::transformationsRelative() { - CORRADE_EXPECT_FAIL("Transformations not relative to scene are not yet implemented."); + CORRADE_SKIP("Transformations not relative to scene are not implemented yet."); Scene3D s; Object3D first(&s); diff --git a/src/Magnum/Vk/Test/EnumsTest.cpp b/src/Magnum/Vk/Test/EnumsTest.cpp index 0e8e8cb02..77d5e07b7 100644 --- a/src/Magnum/Vk/Test/EnumsTest.cpp +++ b/src/Magnum/Vk/Test/EnumsTest.cpp @@ -204,13 +204,19 @@ void EnumsTest::mapVkFormat() { ++nextHandled; \ continue; #define _s(format) \ - case Magnum::PixelFormat::format: \ + case Magnum::PixelFormat::format: { \ CORRADE_COMPARE(nextHandled, i); \ CORRADE_COMPARE(firstUnhandled, 0xffff); \ CORRADE_VERIFY(!hasVkFormat(Magnum::PixelFormat::format)); \ - vkFormat(Magnum::PixelFormat::format); \ + std::ostringstream out; \ + { /* Redirected otherwise graceful assert would abort */ \ + Error redirectError{&out}; \ + vkFormat(Magnum::PixelFormat::format); \ + } \ + Debug{Debug::Flag::NoNewlineAtTheEnd} << out.str(); \ ++nextHandled; \ - continue; + continue; \ + } #include "Magnum/Vk/Implementation/formatMapping.hpp" #undef _s #undef _c @@ -292,13 +298,19 @@ void EnumsTest::mapVkFormatCompressed() { ++nextHandled; \ continue; #define _s(format) \ - case Magnum::CompressedPixelFormat::format: \ + case Magnum::CompressedPixelFormat::format: { \ CORRADE_COMPARE(nextHandled, i); \ CORRADE_COMPARE(firstUnhandled, 0xffff); \ CORRADE_VERIFY(!hasVkFormat(Magnum::CompressedPixelFormat::format)); \ - vkFormat(Magnum::CompressedPixelFormat::format); \ + std::ostringstream out; \ + { /* Redirected otherwise graceful assert would abort */ \ + Error redirectError{&out}; \ + vkFormat(Magnum::CompressedPixelFormat::format); \ + } \ + Debug{Debug::Flag::NoNewlineAtTheEnd} << out.str(); \ ++nextHandled; \ - continue; + continue; \ + } #include "Magnum/Vk/Implementation/compressedFormatMapping.hpp" #undef _s #undef _c