Merge pull request #27113 from keszybz/variable-expansion-rework

Rework serialization of command lines in pid1 and make run not expand variables

1 files changed, 125 insertions, 122 deletions

diff --git a/src/test/meson.build b/src/test/meson.build
index da843a7e47..289967760e 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -219,25 +219,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',
         },
@@ -253,27 +234,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,
@@ -299,27 +263,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,
         },
@@ -332,11 +281,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,
@@ -347,11 +291,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,
         },
@@ -368,25 +307,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,
         },
@@ -395,26 +319,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',
@@ -441,12 +351,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,
         },
@@ -465,11 +369,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',
@@ -527,39 +426,149 @@ 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-core-unit.c'),
+                'dependencies' : common_test_dependencies,
+                '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' : [
@@ -577,10 +586,4 @@ tests += [
                 'link_with' : libudev,
                 'dependencies' : threads,
         },
-        {
-                'sources' : files('test-socket-bind.c'),
-                'dependencies' : libdl,
-                'condition' : 'BPF_FRAMEWORK',
-                'base' : test_core_base,
-        },
 ]