commit: f7cf47bf0d6460644501a6eee925d7da7f8143fa Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Dec 12 22:22:30 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Dec 12 22:23:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cf47bf
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 <AT> gentoo.org> dev-util/meson/meson-0.48.2.ebuild | 13 ++++++++----- dev-util/meson/meson-0.49.0.ebuild | 13 ++++++++----- dev-util/meson/meson-9999.ebuild | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild index 60e9ecb49c6..34aac8dda68 100644 --- 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 aa2b296613e..9605fa9af90 100644 --- 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 aa2b296613e..9605fa9af90 100644 --- 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}" }
