diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-12-12 17:22:30 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-12-12 17:23:01 -0500 |
| commit | f7cf47bf0d6460644501a6eee925d7da7f8143fa (patch) | |
| tree | a656f6b7e5c026b7664756a29b0141e7243d42de /dev-util/meson | |
| parent | sys-apps/openrc: 0.38.3-r1 bump (diff) | |
| download | gentoo-f7cf47bf0d6460644501a6eee925d7da7f8143fa.tar.gz gentoo-f7cf47bf0d6460644501a6eee925d7da7f8143fa.tar.bz2 gentoo-f7cf47bf0d6460644501a6eee925d7da7f8143fa.zip | |
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>
Diffstat (limited to 'dev-util/meson')
| -rw-r--r-- | dev-util/meson/meson-0.48.2.ebuild | 13 | ||||
| -rw-r--r-- | dev-util/meson/meson-0.49.0.ebuild | 13 | ||||
| -rw-r--r-- | 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 60e9ecb49c6c..34aac8dda68b 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 aa2b296613ec..9605fa9af90c 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 aa2b296613ec..9605fa9af90c 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}" } |