X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-udev.c;h=f2283ec7a784b46d634af2f15919e8dcaa05aef4;hb=eb5800026d5a6754514fb8f8a8561b49974fc879;hp=566a73a066f5d2452df19b5a08eea3af81203506;hpb=5168f84a29b9f0002c9d44133cc9830046bb0619;p=elogind.git

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 566a73a06..f2283ec7a 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -35,10 +35,6 @@
 #include "udev.h"
 #include "udev-util.h"
 
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) {}
-
 static int fake_filesystems(void) {
         static const struct fakefs {
                 const char *src;
@@ -99,7 +95,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
 
         log_debug("version %s", VERSION);
-        label_init("/dev");
+        mac_selinux_init("/dev");
 
         sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
 
@@ -149,16 +145,22 @@ int main(int argc, char *argv[]) {
                         mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
                 } else {
                         unlink(udev_device_get_devnode(dev));
-                        util_delete_path(udev, udev_device_get_devnode(dev));
+                        rmdir_parents(udev_device_get_devnode(dev), "/");
                 }
         }
 
-        udev_event_execute_rules(event, USEC_PER_SEC, rules, &sigmask_orig);
-        udev_event_execute_run(event, USEC_PER_SEC, NULL);
+        udev_event_execute_rules(event,
+                                 3 * USEC_PER_SEC, USEC_PER_SEC,
+                                 NULL,
+                                 rules,
+                                 &sigmask_orig);
+        udev_event_execute_run(event,
+                               3 * USEC_PER_SEC, USEC_PER_SEC,
+                               NULL);
 out:
         if (event != NULL && event->fd_signal >= 0)
                 close(event->fd_signal);
-        label_finish();
+        mac_selinux_finish();
 
         return err ? EXIT_FAILURE : EXIT_SUCCESS;
 }