test: rename udev-rule-runner -> test-udev-rule-runner

This partially revert 0454cf05d38d289474ca65c1917d414b2958f6b5.
The executable actually does not work with itself, but needs to be
combined with test-udev.py. But, even so, the executable is for testing.

In the next commit, test and normal executables are declared in the same
way, and naming of the executable becomes essential to classify them.
Let's rename the executable and prefix with 'test-'.

diff --git a/meson.build b/meson.build
index 430457bb1edd334c64fa3d232c549ecb87e3596c..fbf50a6ca08e16864e02ad581f7031ada1328eea 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2743,7 +2743,7 @@ if want_tests != 'false' and static_libudev != 'false'
 endif
 
 if want_tests != 'false'
-        exe = TESTS.get('udev-rule-runner')
+        exe = TESTS.get('test-udev-rule-runner')
         test('test-udev',
              test_udev_py,
              args : ['-v'],

diff --git a/src/test/meson.build b/src/test/meson.build
index ab0f091756a8f108a45447578d4bf92af6a1d297..0d4dfa7f7e823c1f5382debe1f65f456a1b5602b 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -409,23 +409,6 @@ tests += [
                 'sources' : files('test-time-util.c'),
                 'timeout' : 120,
         },
-        {
-                'sources' : files('udev-rule-runner.c'),
-                'link_with' : [
-                        libshared,
-                        libudevd_core,
-                ],
-                'dependencies' : [
-                        libacl,
-                        libblkid,
-                        libkmod,
-                        librt,
-                        libselinux,
-                        threads,
-                ],
-                'includes' : udev_includes,
-                'type' : 'manual',
-        },
         {
                 'sources' : files('test-utmp.c'),
                 'condition' : 'ENABLE_UTMP',

diff --git a/src/udev/meson.build b/src/udev/meson.build
index bc5c859845f2e12174bd147382496a3cf6ed7a40..9807648592f93dc88c239f6c72e84fceb99c998f 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -262,6 +262,23 @@ tests += [
                 'sources' : files('test-udev-node.c'),
                 'base' : test_libudev_base,
         },
+        {
+                'sources' : files('test-udev-rule-runner.c'),
+                'link_with' : [
+                        libshared,
+                        libudevd_core,
+                ],
+                'dependencies' : [
+                        libacl,
+                        libblkid,
+                        libkmod,
+                        librt,
+                        libselinux,
+                        threads,
+                ],
+                'includes' : udev_includes,
+                'type' : 'manual',
+        },
         {
                 'sources' : files('test-udev-rules.c'),
                 'base' : test_libudev_base,

diff --git a/src/test/udev-rule-runner.c b/src/udev/test-udev-rule-runner.c
similarity index 100%
rename from src/test/udev-rule-runner.c
rename to src/udev/test-udev-rule-runner.c

diff --git a/test/test-udev.py b/test/test-udev.py
index 710aaed3a9b805f3a8ee2c9ab70526e85748bc0f..02383ce4e9b0d7bb28474e39a868c2b64788de2a 100755 (executable)
--- a/test/test-udev.py
+++ b/test/test-udev.py
@@ -43,7 +43,7 @@ SYS_SCRIPT     = Path(__file__).with_name('sys-script.py')
 try:
     UDEV_BIN   = Path(os.environ['UDEV_RULE_RUNNER'])
 except KeyError:
-    UDEV_BIN   = Path(__file__).parent / 'manual/udev-rule-runner'
+    UDEV_BIN   = Path(__file__).parent / 'manual/test-udev-rule-runner'
 UDEV_BIN = UDEV_BIN.absolute()
 
 # Those will be set by the udev_setup() fixture