commit:     8291739b1a578f93836f9045246e047c69281c18
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 20:13:19 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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
 

Reply via email to