From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B40941382C5 for ; Mon, 25 May 2020 21:43:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0FD3E0828; Mon, 25 May 2020 21:43:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99EDCE0828 for ; Mon, 25 May 2020 21:43:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DD5A34EF26 for ; Mon, 25 May 2020 21:43:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C307931 for ; Mon, 25 May 2020 21:43:19 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1590442996.c8e5844221a71d1faddee13f2f7921010f786346.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/meson-0.54.2.ebuild dev-util/meson/meson-9999.ebuild X-VCS-Directories: dev-util/meson/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c8e5844221a71d1faddee13f2f7921010f786346 X-VCS-Branch: master Date: Mon, 25 May 2020 21:43:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b8b6f534-88f3-47d9-a0ea-696d770e27d3 X-Archives-Hash: 014e9621e3ddd6f5e14105e73c0e332d commit: c8e5844221a71d1faddee13f2f7921010f786346 Author: Mike Gilbert gentoo org> AuthorDate: Mon May 25 21:34:51 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon May 25 21:43:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e58442 dev-util/meson: disable some additional unit tests Signed-off-by: Mike Gilbert gentoo.org> 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 2ef1f787f28..4945b8d2278 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 053a12bbeb2..5cd9c5f13bb 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