udevadm: test - remove --force option

[elogind.git] / udev / lib / test-libudev.c

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 5d19d5dd75b0110779a072085028d97ea183d914..592a147e0124461f4871eb23702bd6853e0760e3 100644 (file)
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -53,6 +53,13 @@ static void print_device(struct udev_device *device)
        str = udev_device_get_syspath(device);
        printf("syspath:   '%s'\n", str);
 
+       str = udev_device_get_sysname(device);
+       printf("sysname:   '%s'\n", str);
+
+       str = udev_device_get_sysnum(device);
+       if (str != NULL)
+               printf("sysnum:    '%s'\n", str);
+
        str = udev_device_get_devpath(device);
        printf("devpath:   '%s'\n", str);
 
@@ -60,6 +67,10 @@ static void print_device(struct udev_device *device)
        if (str != NULL)
                printf("subsystem: '%s'\n", str);
 
+       str = udev_device_get_devtype(device);
+       if (str != NULL)
+               printf("devtype:   '%s'\n", str);
+
        str = udev_device_get_driver(device);
        if (str != NULL)
                printf("driver:    '%s'\n", str);
@@ -90,7 +101,11 @@ static void print_device(struct udev_device *device)
        if (count > 0)
                printf("found %i properties\n", count);
 
-       str = udev_device_get_attr_value(device, "dev");
+       str = udev_device_get_property_value(device, "MAJOR");
+       if (str != NULL)
+               printf("MAJOR: '%s'\n", str);
+
+       str = udev_device_get_sysattr_value(device, "dev");
        if (str != NULL)
                printf("attr{dev}: '%s'\n", str);
 
@@ -104,7 +119,7 @@ static int test_device(struct udev *udev, const char *syspath)
        printf("looking at device: %s\n", syspath);
        device = udev_device_new_from_syspath(udev, syspath);
        if (device == NULL) {
-               printf("no device\n");
+               printf("no device found\n");
                return -1;
        }
        print_device(device);
@@ -154,6 +169,40 @@ static int test_device_devnum(struct udev *udev)
        return 0;
 }
 
+static int test_device_subsys_name(struct udev *udev)
+{
+       struct udev_device *device;
+
+       printf("looking up device: 'block':'sda'\n");
+       device = udev_device_new_from_subsystem_sysname(udev, "block", "sda");
+       if (device == NULL)
+               return -1;
+       print_device(device);
+       udev_device_unref(device);
+
+       printf("looking up device: 'subsystem':'pci'\n");
+       device = udev_device_new_from_subsystem_sysname(udev, "subsystem", "pci");
+       if (device == NULL)
+               return -1;
+       print_device(device);
+       udev_device_unref(device);
+
+       printf("looking up device: 'drivers':'scsi:sd'\n");
+       device = udev_device_new_from_subsystem_sysname(udev, "drivers", "scsi:sd");
+       if (device == NULL)
+               return -1;
+       print_device(device);
+       udev_device_unref(device);
+
+       printf("looking up device: 'module':'printk'\n");
+       device = udev_device_new_from_subsystem_sysname(udev, "module", "printk");
+       if (device == NULL)
+               return -1;
+       print_device(device);
+       udev_device_unref(device);
+       return 0;
+}
+
 static int test_enumerate_print_list(struct udev_enumerate *enumerate)
 {
        struct udev_list_entry *list_entry;
@@ -269,19 +318,79 @@ static int test_queue(struct udev *udev)
        return 0;
 }
 
-int main(int argc, char *argv[], char *envp[])
+static int test_enumerate(struct udev *udev, const char *subsystem)
+{
+       struct udev_enumerate *udev_enumerate;
+
+       printf("enumerate '%s'\n", subsystem == NULL ? "<all>" : subsystem);
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_add_match_subsystem(udev_enumerate, subsystem);
+       udev_enumerate_scan_devices(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+
+       printf("enumerate 'block'\n");
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_add_match_subsystem(udev_enumerate,"block");
+       udev_enumerate_scan_devices(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+
+       printf("enumerate 'not block'\n");
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_add_nomatch_subsystem(udev_enumerate, "block");
+       udev_enumerate_scan_devices(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+
+       printf("enumerate 'pci, mem, vc'\n");
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_add_match_subsystem(udev_enumerate, "pci");
+       udev_enumerate_add_match_subsystem(udev_enumerate, "mem");
+       udev_enumerate_add_match_subsystem(udev_enumerate, "vc");
+       udev_enumerate_scan_devices(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+
+       printf("enumerate 'subsystem'\n");
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_scan_subsystems(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+
+       printf("enumerate 'property IF_FS_*=filesystem'\n");
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_add_match_property(udev_enumerate, "ID_FS*", "filesystem");
+       udev_enumerate_scan_devices(udev_enumerate);
+       test_enumerate_print_list(udev_enumerate);
+       udev_enumerate_unref(udev_enumerate);
+       return 0;
+}
+
+int main(int argc, char *argv[])
 {
        struct udev *udev = NULL;
        static const struct option options[] = {
-               { "syspath", 1, NULL, 'p' },
-               { "subsystem", 1, NULL, 's' },
-               { "socket", 1, NULL, 'S' },
-               { "debug", 0, NULL, 'd' },
-               { "help", 0, NULL, 'h' },
-               { "version", 0, NULL, 'V' },
+               { "syspath", required_argument, NULL, 'p' },
+               { "subsystem", required_argument, NULL, 's' },
+               { "socket", required_argument, NULL, 'S' },
+               { "debug", no_argument, NULL, 'd' },
+               { "help", no_argument, NULL, 'h' },
+               { "version", no_argument, NULL, 'V' },
                {}
        };
-       struct udev_enumerate *udev_enumerate;
        const char *syspath = "/devices/virtual/mem/null";
        const char *subsystem = NULL;
        const char *socket = "@/org/kernel/udev/monitor";
@@ -342,53 +451,10 @@ int main(int argc, char *argv[], char *envp[])
 
        test_device(udev, syspath);
        test_device_devnum(udev);
+       test_device_subsys_name(udev);
        test_device_parents(udev, syspath);
 
-       printf("enumerate '%s'\n", subsystem == NULL ? "<all>" : subsystem);
-       udev_enumerate = udev_enumerate_new(udev);
-       if (udev_enumerate == NULL)
-               return -1;
-       udev_enumerate_add_match_subsystem(udev_enumerate, subsystem);
-       udev_enumerate_scan_devices(udev_enumerate);
-       test_enumerate_print_list(udev_enumerate);
-       udev_enumerate_unref(udev_enumerate);
-
-       printf("enumerate 'block'\n");
-       udev_enumerate = udev_enumerate_new(udev);
-       if (udev_enumerate == NULL)
-               return -1;
-       udev_enumerate_add_match_subsystem(udev_enumerate,"block");
-       udev_enumerate_scan_devices(udev_enumerate);
-       test_enumerate_print_list(udev_enumerate);
-       udev_enumerate_unref(udev_enumerate);
-
-       printf("enumerate 'not block'\n");
-       udev_enumerate = udev_enumerate_new(udev);
-       if (udev_enumerate == NULL)
-               return -1;
-       udev_enumerate_add_nomatch_subsystem(udev_enumerate, "block");
-       udev_enumerate_scan_devices(udev_enumerate);
-       test_enumerate_print_list(udev_enumerate);
-       udev_enumerate_unref(udev_enumerate);
-
-       printf("enumerate 'pci, mem, vc'\n");
-       udev_enumerate = udev_enumerate_new(udev);
-       if (udev_enumerate == NULL)
-               return -1;
-       udev_enumerate_add_match_subsystem(udev_enumerate, "pci");
-       udev_enumerate_add_match_subsystem(udev_enumerate, "mem");
-       udev_enumerate_add_match_subsystem(udev_enumerate, "vc");
-       udev_enumerate_scan_devices(udev_enumerate);
-       test_enumerate_print_list(udev_enumerate);
-       udev_enumerate_unref(udev_enumerate);
-
-       printf("enumerate 'subsystem'\n");
-       udev_enumerate = udev_enumerate_new(udev);
-       if (udev_enumerate == NULL)
-               return -1;
-       udev_enumerate_scan_subsystems(udev_enumerate);
-       test_enumerate_print_list(udev_enumerate);
-       udev_enumerate_unref(udev_enumerate);
+       test_enumerate(udev, subsystem);
 
        test_queue(udev);