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 46942139360 for ; Wed, 11 Aug 2021 18:03:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 140BDE07A7; Wed, 11 Aug 2021 18:03:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E456FE07A7 for ; Wed, 11 Aug 2021 18:03:30 +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 1B8C6342E81 for ; Wed, 11 Aug 2021 18:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53CF97DC for ; Wed, 11 Aug 2021 18:03:27 +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: <1628704949.16e67b51511f6ad9cdffa1f1bf9ec3b109dd645c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/udev-249-r2.ebuild sys-fs/udev/udev-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 16e67b51511f6ad9cdffa1f1bf9ec3b109dd645c X-VCS-Branch: master Date: Wed, 11 Aug 2021 18:03:27 +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: 226b0ca6-a77f-4258-b6f0-67d882359ee1 X-Archives-Hash: 8b0517d85af2144be3b148dbbb06db26 commit: 16e67b51511f6ad9cdffa1f1bf9ec3b109dd645c Author: Mike Gilbert gentoo org> AuthorDate: Wed Aug 11 18:02:29 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Aug 11 18:02:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e67b51 sys-fs/udev: check if /dev is writable before running tests Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/udev-249-r2.ebuild | 28 +++++++++++++--------------- sys-fs/udev/udev-9999.ebuild | 28 +++++++++++++--------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild index a77771e66f7..08a32a5d3c7 100644 --- a/sys-fs/udev/udev-249-r2.ebuild +++ b/sys-fs/udev/udev-249-r2.ebuild @@ -198,32 +198,30 @@ multilib_src_compile() { eninja "${targets[@]}" } -multilib_src_test() { +src_test() { # The testsuite is *very* finicky. Don't try running it in # containers or anything but a full VM or on bare metal. # udev calls 'mknod' a number of times, and this interacts # badly with kernel namespaces. - if [[ ${EUID} -ne 0 ]]; then - ewarn "udev tests need to run under uid 0" - ewarn "Skipping tests" - elif has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" + if [[ ! -w /dev ]]; then ewarn "udev tests needs full access to /dev" ewarn "Skipping tests" else - einfo Running tests + meson-multilib_src_test + fi +} - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die - fi + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die } multilib_src_install() { diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 270009d07a3..162f5505799 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -195,32 +195,30 @@ multilib_src_compile() { eninja "${targets[@]}" } -multilib_src_test() { +src_test() { # The testsuite is *very* finicky. Don't try running it in # containers or anything but a full VM or on bare metal. # udev calls 'mknod' a number of times, and this interacts # badly with kernel namespaces. - if [[ ${EUID} -ne 0 ]]; then - ewarn "udev tests need to run under uid 0" - ewarn "Skipping tests" - elif has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" + if [[ ! -w /dev ]]; then ewarn "udev tests needs full access to /dev" ewarn "Skipping tests" else - einfo Running tests + meson-multilib_src_test + fi +} - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die - fi + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die } multilib_src_install() {