mirror of
https://github.com/morgan9e/systemd
synced 2026-04-15 00:47:10 +09:00
test: rename udev-rule-runner -> test-udev-rule-runner
This partially revert 0454cf05d3.
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-'.
This commit is contained in:
@@ -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'],
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user