dev-util/meson: disable a test case instead of sandbox

Bug: https://bugs.gentoo.org/673016
Package-Manager: Portage-2.3.52_p8, Repoman-2.3.12_p20
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
index 60e9ecb49c6c28d4df163aefa15ace1427412728..34aac8dda68b4eae5f8dada0328acb1e35747795 100644 (file)
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ b/dev-util/meson/meson-0.48.2.ebuild
@@ -24,6 +24,14 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${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
+
+       distutils-r1_python_prepare_all
+}
+
 python_test() {
        (
                # test_meson_installed
@@ -32,11 +40,6 @@ python_test() {
                # test_cross_file_system_paths
                unset XDG_DATA_HOME
 
-               # ASAN and sandbox both want to control LDPRELOAD
-               # https://bugs.gentoo.org/673016
-               export SANDBOX_ON=0
-               unset LD_PRELOAD
-
                ${EPYTHON} -u run_tests.py
        ) || die "Testing failed with ${EPYTHON}"
 }

diff --git a/dev-util/meson/meson-0.49.0.ebuild b/dev-util/meson/meson-0.49.0.ebuild
index aa2b296613ec71cec8811e57e176c4acb012b85d..9605fa9af90cbaea9ebfc85bfb7fba1125328d12 100644 (file)
--- a/dev-util/meson/meson-0.49.0.ebuild
+++ b/dev-util/meson/meson-0.49.0.ebuild
@@ -24,6 +24,14 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${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
+
+       distutils-r1_python_prepare_all
+}
+
 python_test() {
        (
                # test_meson_installed
@@ -32,11 +40,6 @@ python_test() {
                # test_cross_file_system_paths
                unset XDG_DATA_HOME
 
-               # ASAN and sandbox both want to control LDPRELOAD
-               # https://bugs.gentoo.org/673016
-               export SANDBOX_ON=0
-               unset LD_PRELOAD
-
                ${EPYTHON} -u run_tests.py
        ) || die "Testing failed with ${EPYTHON}"
 }

diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index aa2b296613ec71cec8811e57e176c4acb012b85d..9605fa9af90cbaea9ebfc85bfb7fba1125328d12 100644 (file)
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -24,6 +24,14 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${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
+
+       distutils-r1_python_prepare_all
+}
+
 python_test() {
        (
                # test_meson_installed
@@ -32,11 +40,6 @@ python_test() {
                # test_cross_file_system_paths
                unset XDG_DATA_HOME
 
-               # ASAN and sandbox both want to control LDPRELOAD
-               # https://bugs.gentoo.org/673016
-               export SANDBOX_ON=0
-               unset LD_PRELOAD
-
                ${EPYTHON} -u run_tests.py
        ) || die "Testing failed with ${EPYTHON}"
 }