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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E923158089 for ; Sun, 10 Sep 2023 20:14:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABC402BC017; Sun, 10 Sep 2023 20:14:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 983972BC017 for ; Sun, 10 Sep 2023 20:14:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AC30335C47 for ; Sun, 10 Sep 2023 20:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E926B113E for ; Sun, 10 Sep 2023 20:14:21 +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: <1694376799.8291739b1a578f93836f9045246e047c69281c18.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-254.3.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 8291739b1a578f93836f9045246e047c69281c18 X-VCS-Branch: master Date: Sun, 10 Sep 2023 20:14:21 +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: 152c12c1-16d9-44bd-a955-a8891222a038 X-Archives-Hash: 0679df3bc288ad8679f4ea5a2dda6126 commit: 8291739b1a578f93836f9045246e047c69281c18 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 10 20:13:19 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 10 20:13:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8291739b sys-apps/systemd-utils: more test cleanup Adjust for 0454cf05 upstream. Bug: https://bugs.gentoo.org/913933 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd-utils/systemd-utils-254.3.ebuild | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild index 9fabbb727904..849af65cc76c 100644 --- a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild @@ -338,14 +338,12 @@ multilib_src_compile() { ) if use test; then targets+=( - # Used by udev-test.pl - systemd-detect-virt - test-fido-id-desc test-udev-builtin test-udev-event test-udev-node test-udev-util + udev-rule-runner ) fi fi @@ -386,16 +384,12 @@ multilib_src_test() { tests+=( rule-syntax-check test-fido-id-desc + test-udev test-udev-builtin test-udev-event test-udev-node test-udev-util ) - if [[ -w /dev ]]; then - tests+=( udev-test ) - else - ewarn "Skipping udev-test (needs write access to /dev)" - fi fi fi if use udev; then @@ -447,6 +441,7 @@ multilib_src_install() { exeinto "${rootprefix}"/lib/udev doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + rm -f rules.d/99-systemd.rules insinto "${rootprefix}"/lib/udev/rules.d doins rules.d/*.rules