udev: rename test-udevd.c -> test-udev-manager.c

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 2cb504d7f6bc329cbac777e60ba20905437e7d3e..baedcaa2fe827aa8c7e72671c7a48f58d0409783 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -219,19 +219,19 @@ tests += [
                 'base' : test_libudev_base,
         },
         {
-                'sources' : files('test-udev-node.c'),
+                'sources' : files('test-udev-manager.c'),
                 'base' : test_libudev_base,
         },
         {
-                'sources' : files('test-udev-rules.c'),
+                'sources' : files('test-udev-node.c'),
                 'base' : test_libudev_base,
         },
         {
-                'sources' : files('test-udev-spawn.c'),
+                'sources' : files('test-udev-rules.c'),
                 'base' : test_libudev_base,
         },
         {
-                'sources' : files('test-udevd.c'),
+                'sources' : files('test-udev-spawn.c'),
                 'base' : test_libudev_base,
         },
 ]

diff --git a/src/udev/test-udev-manager.c b/src/udev/test-udev-manager.c
new file mode 100644 (file)
index 0000000..d444b0b
--- /dev/null
+++ b/src/udev/test-udev-manager.c
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include "tests.h"
+#include "udev-manager.h"
+
+TEST(devpath_conflict) {
+        assert_se(!devpath_conflict(NULL, NULL));
+        assert_se(!devpath_conflict(NULL, "/devices/pci0000:00/0000:00:1c.4"));
+        assert_se(!devpath_conflict("/devices/pci0000:00/0000:00:1c.4", NULL));
+        assert_se(!devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:00.0"));
+        assert_se(!devpath_conflict("/devices/virtual/net/veth99", "/devices/virtual/net/veth999"));
+
+        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:1c.4"));
+        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0"));
+        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1",
+                                   "/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p1"));
+}
+
+DEFINE_TEST_MAIN(LOG_DEBUG);

diff --git a/src/udev/test-udevd.c b/src/udev/test-udevd.c
deleted file mode 100644 (file)
index d444b0b..0000000
--- a/src/udev/test-udevd.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "tests.h"
-#include "udev-manager.h"
-
-TEST(devpath_conflict) {
-        assert_se(!devpath_conflict(NULL, NULL));
-        assert_se(!devpath_conflict(NULL, "/devices/pci0000:00/0000:00:1c.4"));
-        assert_se(!devpath_conflict("/devices/pci0000:00/0000:00:1c.4", NULL));
-        assert_se(!devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:00.0"));
-        assert_se(!devpath_conflict("/devices/virtual/net/veth99", "/devices/virtual/net/veth999"));
-
-        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:1c.4"));
-        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4", "/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0"));
-        assert_se(devpath_conflict("/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1",
-                                   "/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p1"));
-}
-
-DEFINE_TEST_MAIN(LOG_DEBUG);