diff --git a/meson.build b/meson.build index 430457bb1e..fbf50a6ca0 100644 --- 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 ab0f091756..0d4dfa7f7e 100644 --- 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 bc5c859845..9807648592 100644 --- 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 710aaed3a9..02383ce4e9 100755 --- 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