| 1 |
commit: c8e5844221a71d1faddee13f2f7921010f786346 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 25 21:34:51 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 25 21:43:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e58442 |
| 7 |
|
| 8 |
dev-util/meson: disable some additional unit tests |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/meson/meson-0.54.2.ebuild | 22 ++++++++++++++++------ |
| 13 |
dev-util/meson/meson-9999.ebuild | 22 ++++++++++++++++------ |
| 14 |
2 files changed, 32 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild |
| 17 |
index 2ef1f787f28..4945b8d2278 100644 |
| 18 |
--- a/dev-util/meson/meson-0.54.2.ebuild |
| 19 |
+++ b/dev-util/meson/meson-0.54.2.ebuild |
| 20 |
@@ -39,13 +39,23 @@ PATCHES=( |
| 21 |
) |
| 22 |
|
| 23 |
python_prepare_all() { |
| 24 |
- # ASAN and sandbox both want control over LD_PRELOAD |
| 25 |
- # https://bugs.gentoo.org/673016 |
| 26 |
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die |
| 27 |
+ local disable_unittests=( |
| 28 |
+ # ASAN and sandbox both want control over LD_PRELOAD |
| 29 |
+ # https://bugs.gentoo.org/673016 |
| 30 |
+ -e 's/test_generate_gir_with_address_sanitizer/_&/' |
| 31 |
|
| 32 |
- # ASAN is unsupported on some targets |
| 33 |
- # https://bugs.gentoo.org/692822 |
| 34 |
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die |
| 35 |
+ # ASAN is unsupported on some targets |
| 36 |
+ # https://bugs.gentoo.org/692822 |
| 37 |
+ -e 's/test_pch_with_address_sanitizer/_&/' |
| 38 |
+ |
| 39 |
+ # https://github.com/mesonbuild/meson/issues/7203 |
| 40 |
+ -e 's/test_templates/_&/' |
| 41 |
+ |
| 42 |
+ # Broken due to python2 wrapper |
| 43 |
+ -e 's/test_python_module/_&/' |
| 44 |
+ ) |
| 45 |
+ |
| 46 |
+ sed -i "${disable_unittests[@]}" run_unittests.py || die |
| 47 |
|
| 48 |
# Broken due to python2 script created by python_wrapper_setup |
| 49 |
rm -r "test cases/frameworks/1 boost" || die |
| 50 |
|
| 51 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild |
| 52 |
index 053a12bbeb2..5cd9c5f13bb 100644 |
| 53 |
--- a/dev-util/meson/meson-9999.ebuild |
| 54 |
+++ b/dev-util/meson/meson-9999.ebuild |
| 55 |
@@ -35,13 +35,23 @@ DEPEND=" |
| 56 |
" |
| 57 |
|
| 58 |
python_prepare_all() { |
| 59 |
- # ASAN and sandbox both want control over LD_PRELOAD |
| 60 |
- # https://bugs.gentoo.org/673016 |
| 61 |
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die |
| 62 |
+ local disable_unittests=( |
| 63 |
+ # ASAN and sandbox both want control over LD_PRELOAD |
| 64 |
+ # https://bugs.gentoo.org/673016 |
| 65 |
+ -e 's/test_generate_gir_with_address_sanitizer/_&/' |
| 66 |
|
| 67 |
- # ASAN is unsupported on some targets |
| 68 |
- # https://bugs.gentoo.org/692822 |
| 69 |
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die |
| 70 |
+ # ASAN is unsupported on some targets |
| 71 |
+ # https://bugs.gentoo.org/692822 |
| 72 |
+ -e 's/test_pch_with_address_sanitizer/_&/' |
| 73 |
+ |
| 74 |
+ # https://github.com/mesonbuild/meson/issues/7203 |
| 75 |
+ -e 's/test_templates/_&/' |
| 76 |
+ |
| 77 |
+ # Broken due to python2 wrapper |
| 78 |
+ -e 's/test_python_module/_&/' |
| 79 |
+ ) |
| 80 |
+ |
| 81 |
+ sed -i "${disable_unittests[@]}" run_unittests.py || die |
| 82 |
|
| 83 |
# Broken due to python2 script created by python_wrapper_setup |
| 84 |
rm -r "test cases/frameworks/1 boost" || die |
Archives