meson: move simple test entries

diff --git a/src/test/meson.build b/src/test/meson.build
index ca2c96e94d85668561c371f88c07f779c9167e03..6465b6c1160f7ef59710d150ac5f170bd438d6b8 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -58,6 +58,7 @@ simple_tests += files(
         'test-alloc-util.c',
         'test-architecture.c',
         'test-argv-util.c',
+        'test-arphrd-util.c',
         'test-audit-util.c',
         'test-barrier.c',
         'test-binfmt-util.c',
@@ -65,6 +66,7 @@ simple_tests += files(
         'test-bitmap.c',
         'test-blockdev-util.c',
         'test-bootspec.c',
+        'test-btrfs.c',
         'test-build-path.c',
         'test-bus-unit-util.c',
         'test-bus-util.c',
@@ -129,6 +131,7 @@ simple_tests += files(
         'test-io-util.c',
         'test-iovec-util.c',
         'test-iovec-wrapper.c',
+        'test-ip-protocol-list.c',
         'test-journal-importer.c',
         'test-kbd-util.c',
         'test-label.c',
@@ -162,26 +165,34 @@ simple_tests += files(
         'test-osc-context.c',
         'test-parse-argument.c',
         'test-parse-helpers.c',
+        'test-parse-util.c',
         'test-path-lookup.c',
         'test-path-util.c',
         'test-percent-util.c',
         'test-pidref.c',
+        'test-pressure.c',
         'test-pretty-print.c',
         'test-printf.c',
         'test-prioq.c',
         'test-proc-cmdline.c',
+        'test-process-util.c',
         'test-procfs-util.c',
+        'test-progress-bar.c',
         'test-psi-util.c',
+        'test-qmp-client.c',
+        'test-qrcode-util.c',
         'test-ratelimit.c',
         'test-raw-clone.c',
         'test-recovery-key.c',
         'test-recurse-dir.c',
         'test-replace-var.c',
+        'test-reread-partition-table.c',
         'test-rlimit-util.c',
         'test-rm-rf.c',
         'test-secure-bits.c',
         'test-serialize.c',
         'test-set.c',
+        'test-set-disable-mempool.c',
         'test-sha1.c',
         'test-sha256.c',
         'test-sigbus.c',
@@ -236,9 +247,6 @@ executables += [
                 'sources' : files('test-af-list.c') +
                             generated_gperf_headers,
         },
-        test_template + {
-                'sources' : files('test-arphrd-util.c')
-        },
         test_template + {
                 'sources' : files('test-ask-password-api.c'),
                 'type' : 'manual',
@@ -251,9 +259,6 @@ executables += [
                 'sources' : files('test-boot-timestamps.c'),
                 'conditions' : ['ENABLE_EFI'],
         },
-        test_template + {
-                'sources' : files('test-btrfs.c'),
-        },
         test_template + {
                 'sources' : files('test-chase-manual.c'),
                 'type' : 'manual',
@@ -333,9 +338,6 @@ executables += [
                 ],
                 'timeout' : 180,
         },
-        test_template + {
-                'sources' : files('test-ip-protocol-list.c'),
-        },
         test_template + {
                 'sources' : files('test-ipcrm.c'),
                 'type' : 'unsafe',
@@ -370,9 +372,6 @@ executables += [
                 'sources' : files('test-math-util.c'),
                 'dependencies' : libm,
         },
-        test_template + {
-                'sources' : files('test-pressure.c'),
-        },
         test_template + {
                 'sources' : files('test-mount-util.c'),
                 'conditions' : ['HAVE_LIBMOUNT'],
@@ -405,37 +404,19 @@ executables += [
                 'dependencies' : libopenssl_cflags,
                 'conditions' : ['HAVE_OPENSSL'],
         },
-        test_template + {
-                'sources' : files('test-parse-util.c'),
-        },
         test_template + {
                 'sources' : files('test-shift-uid.c'),
                 'type' : 'manual',
         },
-        test_template + {
-                'sources' : files('test-process-util.c'),
-        },
-        test_template + {
-                'sources' : files('test-progress-bar.c'),
-        },
-        test_template + {
-                'sources' : files('test-qmp-client.c'),
-        },
         test_template + {
                 'sources' : files('test-qmp-client-qemu.c'),
                 'objects' : ['systemd-vmspawn'],
                 'conditions' : ['ENABLE_VMSPAWN'],
         },
-        test_template + {
-                'sources' : files('test-qrcode-util.c'),
-        },
         test_template + {
                 'sources' : files('test-random-util.c'),
                 'timeout' : 120,
         },
-        test_template + {
-                'sources' : files('test-reread-partition-table.c'),
-        },
         test_template + {
                 'sources' : files('test-reread-partition-table-manual.c'),
                 'type' : 'manual',
@@ -454,9 +435,6 @@ executables += [
                 'sources' : files('test-selinux.c'),
                 'dependencies' : libselinux_cflags,
         },
-        test_template + {
-                'sources' : files('test-set-disable-mempool.c'),
-        },
         test_template + {
                 'sources' : files('test-sizeof.c'),
                 'link_with' : [
@@ -481,15 +459,6 @@ executables += [
                 'sources' : files('test-utmp.c'),
                 'conditions' : ['ENABLE_UTMP'],
         },
-        core_test_template + {
-                'sources' : files('test-varlink-idl-job.c'),
-        },
-        core_test_template + {
-                'sources' : files('test-varlink-idl-manager.c'),
-        },
-        core_test_template + {
-                'sources' : files('test-varlink-idl-unit.c'),
-        },
         test_template + {
                 'sources' : files('test-varlink-idl-machine.c'),
                 'objects' : ['systemd-machined'],
@@ -631,6 +600,15 @@ executables += [
                 'sources' : files('test-unit-serialize.c'),
                 'dependencies' : common_test_dependencies,
         },
+        core_test_template + {
+                'sources' : files('test-varlink-idl-job.c'),
+        },
+        core_test_template + {
+                'sources' : files('test-varlink-idl-manager.c'),
+        },
+        core_test_template + {
+                'sources' : files('test-varlink-idl-unit.c'),
+        },
         core_test_template + {
                 'sources' : files('test-watch-pid.c'),
                 'dependencies' : common_test_dependencies,