From 4059d1136ae1cf664d325841eeb95dc713e0f199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 9 Apr 2023 10:18:22 +0200 Subject: [PATCH] sceneconverter: correctly mark test case plugin requirements. Otherwise if the plugins fail to load due to ABI issues or whatever the test will fail (which it shouldn't). --- src/Magnum/SceneTools/Test/SceneConverterTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp index b1a78a6ca..981776d30 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp +++ b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp @@ -751,7 +751,7 @@ const struct { }; const struct { - const char* name; + TestSuite::TestCaseDescriptionSourceLocation name; Containers::Array args; const char* requiresImporter; const char* requiresImageImporter; @@ -1009,7 +1009,7 @@ const struct { Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/images-2d.gltf"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.gltf") }}, - "ObjImporter", "PngImporter", "GltfSceneConverter", "StbResizeImageConverter", + "GltfImporter", "PngImporter", "GltfSceneConverter", "StbResizeImageConverter", "\n" /* Just a suffix */ "Trade::GltfSceneConverter::add(): can't load NonexistentImageConverter for image conversion\n" "Cannot add 2D image 0\n"}, @@ -1021,7 +1021,7 @@ const struct { Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/images-3d.gltf"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.gltf") }}, - "ObjImporter", "PngImporter", "GltfSceneConverter", "StbResizeImageConverter", + "GltfImporter", "PngImporter", "GltfSceneConverter", "StbResizeImageConverter", "\n" /* Just a suffix */ "Trade::GltfSceneConverter::add(): can't load NonexistentImageConverter for image conversion\n" "Cannot add 3D image 0\n"},