From c8e5844221a71d1faddee13f2f7921010f786346 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 25 May 2020 17:34:51 -0400 Subject: [PATCH] dev-util/meson: disable some additional unit tests Signed-off-by: Mike Gilbert --- dev-util/meson/meson-0.54.2.ebuild | 22 ++++++++++++++++------ dev-util/meson/meson-9999.ebuild | 22 ++++++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild index 2ef1f787f28b..4945b8d2278e 100644 --- a/dev-util/meson/meson-0.54.2.ebuild +++ b/dev-util/meson/meson-0.54.2.ebuild @@ -39,13 +39,23 @@ PATCHES=( ) python_prepare_all() { - # ASAN and sandbox both want control over LD_PRELOAD - # https://bugs.gentoo.org/673016 - sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" run_unittests.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 053a12bbeb2f..5cd9c5f13bb2 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -35,13 +35,23 @@ DEPEND=" " python_prepare_all() { - # ASAN and sandbox both want control over LD_PRELOAD - # https://bugs.gentoo.org/673016 - sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" run_unittests.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die -- 2.26.2