From 49241870b75bd41885a8d58d4f418f464740ca42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 8 Jul 2025 16:36:25 +0200 Subject: [PATCH] package: run all magnum-*-info utils to collect coverage. --- package/archlinux/PKGBUILD-coverage | 5 +++-- package/ci/unix-desktop-gles.sh | 1 + package/ci/unix-desktop-vulkan.sh | 2 ++ package/ci/unix-desktop.sh | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage index 7587f735a..325e79952 100644 --- a/package/archlinux/PKGBUILD-coverage +++ b/package/archlinux/PKGBUILD-coverage @@ -91,9 +91,10 @@ check() { ./Debug/bin/magnum-al-info > /dev/null ./Debug/bin/magnum-al-info --extension-strings > /dev/null + ./Debug/bin/magnum-gl-info --extension-strings > /dev/null ./Debug/bin/magnum-gl-info --limits > /dev/null - # Not calling vk-info because currently it doesn't do anything that - # wouldn't be covered elsewhere (but it causes false positives in coverage) + ./Debug/bin/magnum-vk-info --extension-strings > /dev/null + ./Debug/bin/magnum-vk-info --features rm -rf coverage mkdir coverage diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 0398356d8..3c989db54 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -73,6 +73,7 @@ MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisam MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_ANGLE_base_vertex_base_instance" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_ANGLE_base_vertex_base_instance GL_EXT_multi_draw_arrays GL_ANGLE_multi_draw" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" ctest -V -R GLTest +Debug/bin/magnum-gl-info --extension-strings Debug/bin/magnum-gl-info --limits # Test install, after running the tests as for them it shouldn't be needed diff --git a/package/ci/unix-desktop-vulkan.sh b/package/ci/unix-desktop-vulkan.sh index bca760a42..086dc26f7 100755 --- a/package/ci/unix-desktop-vulkan.sh +++ b/package/ci/unix-desktop-vulkan.sh @@ -91,6 +91,8 @@ export CORRADE_TEST_COLOR=ON ctest -V MAGNUM_VULKAN_VERSION=1.0 CORRADE_TEST_SKIP_BENCHMARKS=ON ctest -V -R VkTest MAGNUM_DISABLE_EXTENSIONS="VK_KHR_get_physical_device_properties2 VK_KHR_get_memory_requirements2 VK_KHR_bind_memory2 VK_KHR_create_renderpass2 VK_KHR_copy_commands2 VK_KHR_maintenance1 VK_KHR_multiview VK_KHR_maintenance2" MAGNUM_VULKAN_VERSION=1.0 CORRADE_TEST_SKIP_BENCHMARKS=ON ctest -V -R VkTest +Debug/bin/magnum-vk-info --extension-strings +Debug/bin/magnum-vk-info --features # Test install, after running the tests as for them it shouldn't be needed ninja install diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index e396e1869..479061fbf 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -85,6 +85,9 @@ if [ "$TARGET_EGL" == "ON" ]; then MAGNUM_DISABLE_EXTENSIONS="GL_ARB_invalidate_subdata GL_ARB_multi_bind GL_ARB_separate_shader_objects GL_ARB_texture_storage GL_ARB_texture_storage_multisample GL_ARB_shading_language_420pack GL_ARB_explicit_uniform_location GL_ARB_explicit_attrib_location GL_ARB_texture_filter_anisotropic" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_ARB_direct_state_access GL_ARB_get_texture_sub_image GL_ARB_robustness" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_ARB_uniform_buffer_object GL_ARB_shader_storage_buffer_object GL_ARB_vertex_array_object GL_KHR_debug" ctest -V -R GLTest + $CONFIGURATION/bin/magnum-al-info --extension-strings + $CONFIGURATION/bin/magnum-al-info + $CONFIGURATION/bin/magnum-gl-info --extension-strings $CONFIGURATION/bin/magnum-gl-info --limits else ctest -V -E "GLTest|GLBenchmark|VkTest"