From d89675e8b08a92b564f852fdb18a5a1247dee620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 11 Feb 2022 13:31:17 +0100 Subject: [PATCH] DebugTools: properly skip CompareImage tests with converters missing. It only checked for importers, but the second part of these tests uses also image converters to produce the actual files. --- .../DebugTools/Test/CompareImageTest.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp index 9090a44ec..25df1603f 100644 --- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp +++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp @@ -1095,6 +1095,10 @@ void CompareImageTest::imageFileError() { if(Utility::Directory::exists(filename)) CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(!(_converterManager->loadState("AnyImageConverter") & PluginManager::LoadState::Loaded) || + !(_converterManager->loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) + CORRADE_SKIP("AnyImageConverter / TgaImageConverter plugins not found."); + { out.str({}); Debug redirectOutput(&out); @@ -1180,6 +1184,10 @@ void CompareImageTest::imageFileExpectedLoadFailed() { if(Utility::Directory::exists(filename)) CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(!(_converterManager->loadState("AnyImageConverter") & PluginManager::LoadState::Loaded) || + !(_converterManager->loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) + CORRADE_SKIP("AnyImageConverter / TgaImageConverter plugins not found."); + { out.str({}); Debug redirectOutput(&out); @@ -1318,6 +1326,10 @@ void CompareImageTest::imageToFileError() { if(Utility::Directory::exists(filename)) CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(!(_converterManager->loadState("AnyImageConverter") & PluginManager::LoadState::Loaded) || + !(_converterManager->loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) + CORRADE_SKIP("AnyImageConverter / TgaImageConverter plugins not found."); + { out.str({}); Debug redirectOutput(&out); @@ -1379,6 +1391,10 @@ void CompareImageTest::imageToFileExpectedLoadFailed() { if(Utility::Directory::exists(filename)) CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(!(_converterManager->loadState("AnyImageConverter") & PluginManager::LoadState::Loaded) || + !(_converterManager->loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) + CORRADE_SKIP("AnyImageConverter / TgaImageConverter plugins not found."); + { out.str({}); Debug redirectOutput(&out); @@ -1674,6 +1690,10 @@ void CompareImageTest::pixelsToFileError() { if(Utility::Directory::exists(filename)) CORRADE_VERIFY(Utility::Directory::rm(filename)); + if(!(_converterManager->loadState("AnyImageConverter") & PluginManager::LoadState::Loaded) || + !(_converterManager->loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) + CORRADE_SKIP("AnyImageConverter / TgaImageConverter plugins not found."); + { out.str({}); Debug redirectOutput(&out);