diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-03 08:49:17 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-04 21:28:36 +0200 |
commit | 23c3c5d4234cb9f157b5c0d6aa6fbfed601a3202 (patch) | |
tree | b94a2b508950ebcdd6c19a7f310e26600ebe1421 /src | |
parent | 9f27df293804270355e24cf96fe196afd0c0e73e (diff) | |
download | systemd-23c3c5d4234cb9f157b5c0d6aa6fbfed601a3202.tar.gz |
meson: redo grouping of tests under src/test/
Move the tests that link to libcore into a separate subgroup.
They are special and it makes sense to keep them together. While
at it, make the list alphabetical.
Also, merge the list additions into one. No idea why it was like that.
Diffstat (limited to 'src')
-rw-r--r-- | src/test/meson.build | 242 |
1 files changed, 120 insertions, 122 deletions
diff --git a/src/test/meson.build b/src/test/meson.build index d20c911e2b..0310212700 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -217,25 +217,6 @@ tests += [ 'condition' : 'ENABLE_EFI', }, { - 'sources' : files('test-bpf-devices.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { - 'sources' : files('test-bpf-firewall.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { - 'sources' : files('test-bpf-foreign-programs.c'), - 'base' : test_core_base, - }, - { - 'sources' : files('test-bpf-lsm.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { 'sources' : files('test-btrfs.c'), 'type' : 'manual', }, @@ -251,27 +232,10 @@ tests += [ 'dependencies' : libcap, }, { - 'sources' : files('test-cgroup-cpu.c'), - 'base' : test_core_base, - }, - { - 'sources' : files('test-cgroup-mask.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { - 'sources' : files('test-cgroup-unit-default.c'), - 'base' : test_core_base, - }, - { 'sources' : files('test-chase-manual.c'), 'type' : 'manual', }, { - 'sources' : files('test-chown-rec.c'), - 'base' : test_core_base, - }, - { 'sources' : files('test-compress-benchmark.c'), 'link_with' : [ libbasic_compress, @@ -297,27 +261,12 @@ tests += [ 'dependencies' : libp11kit_cflags }, { - 'sources' : files('test-emergency-action.c'), - 'base' : test_core_base, - }, - { - 'sources' : files('test-engine.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { 'sources' : [ files('test-errno-list.c'), generated_gperf_headers, ], }, { - 'sources' : files('test-execute.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - 'timeout' : 360, - }, - { 'sources' : files('test-fd-util.c'), 'dependencies' : libseccomp, }, @@ -330,11 +279,6 @@ tests += [ 'timeout' : 180, }, { - 'sources' : files('test-install.c'), - 'base' : test_core_base, - 'type' : 'manual', - }, - { 'sources' : [ files('test-ip-protocol-list.c'), shared_generated_gperf_headers, @@ -345,11 +289,6 @@ tests += [ 'type' : 'unsafe', }, { - 'sources' : files('test-job-type.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { 'sources' : files('test-json.c'), 'dependencies' : libm, }, @@ -366,25 +305,10 @@ tests += [ ], }, { - 'sources' : files('test-load-fragment.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { - 'sources' : files('test-loop-block.c'), - 'dependencies' : [threads, libblkid], - 'base' : test_core_base, - 'parallel' : false, - }, - { 'sources' : files('test-loopback.c'), 'dependencies' : common_test_dependencies, }, { - 'sources' : files('test-manager.c'), - 'base' : test_core_base, - }, - { 'sources' : files('test-math-util.c'), 'dependencies' : libm, }, @@ -393,26 +317,12 @@ tests += [ 'dependencies' : threads, }, { - 'sources' : files('test-namespace.c'), - 'dependencies' : [ - libblkid, - threads, - ], - 'base' : test_core_base, - }, - { 'sources' : files('test-netlink-manual.c'), 'dependencies' : libkmod, 'condition' : 'HAVE_KMOD', 'type' : 'manual', }, { - 'sources' : files('test-ns.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - 'type' : 'manual', - }, - { 'sources' : files('test-nscd-flush.c'), 'condition' : 'ENABLE_NSCD', 'type' : 'manual', @@ -439,12 +349,6 @@ tests += [ 'dependencies' : libm, }, { - 'sources' : files('test-path.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - 'timeout' : 120, - }, - { 'sources' : files('test-process-util.c'), 'dependencies' : threads, }, @@ -463,11 +367,6 @@ tests += [ 'c_args' : '-I@0@'.format(efi_config_h_dir), }, { - 'sources' : files('test-sched-prio.c'), - 'dependencies' : common_test_dependencies, - 'base' : test_core_base, - }, - { 'sources' : files('test-seccomp.c'), 'dependencies' : libseccomp, 'condition' : 'HAVE_SECCOMP', @@ -525,39 +424,144 @@ tests += [ 'type' : 'manual', }, { - 'sources' : files('test-unit-name.c'), + 'sources' : files('test-utmp.c'), + 'condition' : 'ENABLE_UTMP', + }, + { + 'sources' : files('test-varlink.c'), + 'dependencies' : threads, + }, + { + 'sources' : files('test-watchdog.c'), + 'type' : 'unsafe', + }, + + + # Tests that link to libcore, i.e. tests for pid1 code. + { + 'sources' : files('test-bpf-devices.c'), 'dependencies' : common_test_dependencies, 'base' : test_core_base, }, { - 'sources' : files('test-unit-serialize.c'), + 'sources' : files('test-bpf-firewall.c'), 'dependencies' : common_test_dependencies, 'base' : test_core_base, }, { - 'sources' : files('test-utmp.c'), - 'condition' : 'ENABLE_UTMP', + 'sources' : files('test-bpf-foreign-programs.c'), + 'base' : test_core_base, }, { - 'sources' : files('test-varlink.c'), - 'dependencies' : threads, + 'sources' : files('test-bpf-lsm.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, }, { - 'sources' : files('test-watch-pid.c'), + 'sources' : files('test-cgroup-cpu.c'), + 'base' : test_core_base, + }, + { + 'sources' : files('test-cgroup-mask.c'), 'dependencies' : common_test_dependencies, 'base' : test_core_base, }, { - 'sources' : files('test-watchdog.c'), - 'type' : 'unsafe', + 'sources' : files('test-cgroup-unit-default.c'), + 'base' : test_core_base, + }, + { + 'sources' : files('test-chown-rec.c'), + 'base' : test_core_base, + }, + { + 'sources' : files('test-emergency-action.c'), + 'base' : test_core_base, + }, + { + 'sources' : files('test-engine.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-execute.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + 'timeout' : 360, + }, + { + 'sources' : files('test-install.c'), + 'base' : test_core_base, + 'type' : 'manual', + }, + { + 'sources' : files('test-job-type.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-load-fragment.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-loop-block.c'), + 'dependencies' : [threads, libblkid], + 'base' : test_core_base, + 'parallel' : false, + }, + { + 'sources' : files('test-manager.c'), + 'base' : test_core_base, + }, + { + 'sources' : files('test-namespace.c'), + 'dependencies' : [ + libblkid, + threads, + ], + 'base' : test_core_base, + }, + { + 'sources' : files('test-ns.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + 'type' : 'manual', + }, + { + 'sources' : files('test-path.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + 'timeout' : 120, + }, + { + 'sources' : files('test-sched-prio.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-socket-bind.c'), + 'dependencies' : libdl, + 'condition' : 'BPF_FRAMEWORK', + 'base' : test_core_base, + }, + { + 'sources' : files('test-unit-name.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-unit-serialize.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, + }, + { + 'sources' : files('test-watch-pid.c'), + 'dependencies' : common_test_dependencies, + 'base' : test_core_base, }, -] - -############################################################ - -# define some tests here, because the link_with deps were not defined earlier -tests += [ + # Tests from other directories that have link_with deps that were not defined earlier { 'sources' : files('../libsystemd/sd-bus/test-bus-error.c'), 'link_with' : [ @@ -575,10 +579,4 @@ tests += [ 'link_with' : libudev, 'dependencies' : threads, }, - { - 'sources' : files('test-socket-bind.c'), - 'dependencies' : libdl, - 'condition' : 'BPF_FRAMEWORK', - 'base' : test_core_base, - }, ] |