diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index d7650a15d..a167ada6e 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -732,6 +732,9 @@ jobs: -DMAGNUM_WITH_WINDOWLESSCGLAPPLICATION=ON -DMAGNUM_WITH_CGLCONTEXT=ON -DMAGNUM_SCENECONVERTER_STATIC_PLUGINS=Magnum::AnySceneImporter;Magnum::ObjImporter + # For some reason on the 15.1 image OpenAL hangs on startup. Skip those + # tests. + EXTRA_EXCLUDED_TESTS: "|ALTest" CMAKE_CXX_FLAGS: --coverage CONFIGURATION: Debug steps: diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index 479061fbf..eaf0950f4 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -81,7 +81,7 @@ export TSAN_OPTIONS="color=always" # make sure the MAGNUM_TARGET_EGL=OFF option is at least compile-tested too. if [ "$TARGET_EGL" == "ON" ]; then # Keep in sync with package/archlinux/PKGBUILD and PKGBUILD-coverage - ctest -V -E "GLBenchmark|VkTest" + ctest -V -E "GLBenchmark|VkTest${EXTRA_EXCLUDED_TESTS}" 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 @@ -90,7 +90,7 @@ if [ "$TARGET_EGL" == "ON" ]; then $CONFIGURATION/bin/magnum-gl-info --extension-strings $CONFIGURATION/bin/magnum-gl-info --limits else - ctest -V -E "GLTest|GLBenchmark|VkTest" + ctest -V -E "GLTest|GLBenchmark|VkTest${EXTRA_EXCLUDED_TESTS}" fi # Test install, after running the tests as for them it shouldn't be needed