libsystemd: Clean up meson.build

Merge the two blocks adding tests, since there seems to be
no obvious reason to have two separate blocks, as they both
contain tests from the same libraries.

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 08d8d7c5c39e7c40d81ff94426c69bcb4d74e1d1..2fab54719474ce2104ef5325910e80e12f6c48ae 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -174,29 +174,6 @@ libsystemd_pc = custom_target(
 
 ############################################################
 
-simple_tests += files(
-        'sd-journal/test-audit-type.c',
-        'sd-journal/test-catalog.c',
-        'sd-journal/test-journal-file.c',
-        'sd-journal/test-journal-init.c',
-        'sd-journal/test-journal-match.c',
-        'sd-journal/test-journal-send.c',
-        'sd-journal/test-mmap-cache.c',
-)
-
-libsystemd_tests += [
-        {
-                'sources' : files('sd-journal/test-journal-enum.c'),
-                'timeout' : 360,
-        },
-        {
-                'sources' : files('sd-event/test-event.c'),
-                'timeout' : 120,
-        }
-]
-
-############################################################
-
 simple_tests += files(
         'sd-bus/test-bus-creds.c',
         'sd-bus/test-bus-introspect.c',
@@ -204,20 +181,26 @@ simple_tests += files(
         'sd-bus/test-bus-vtable.c',
         'sd-device/test-device-util.c',
         'sd-device/test-sd-device-monitor.c',
+        'sd-hwdb/test-sd-hwdb.c',
+        'sd-id128/test-id128.c',
+        'sd-journal/test-audit-type.c',
+        'sd-journal/test-catalog.c',
+        'sd-journal/test-journal-file.c',
         'sd-journal/test-journal-flush.c',
+        'sd-journal/test-journal-init.c',
         'sd-journal/test-journal-interleaving.c',
+        'sd-journal/test-journal-match.c',
+        'sd-journal/test-journal-send.c',
         'sd-journal/test-journal-stream.c',
         'sd-journal/test-journal.c',
+        'sd-journal/test-mmap-cache.c',
         'sd-login/test-login.c',
         'sd-login/test-sd-login.c',
         'sd-netlink/test-netlink.c',
+        'sd-path/test-sd-path.c',
 )
 
 libsystemd_tests += [
-        {
-                'sources' : files('sd-device/test-sd-device.c'),
-                'dependencies' : [ threads, libmount_cflags ],
-        },
         {
                 'sources' : files('sd-bus/test-bus-address.c'),
                 'dependencies' : threads
@@ -275,6 +258,18 @@ libsystemd_tests += [
                 'dependencies' : threads,
                 'timeout' : 120,
         },
+        {
+                'sources' : files('sd-device/test-sd-device.c'),
+                'dependencies' : [threads, libmount_cflags],
+        },
+        {
+                'sources' : files('sd-event/test-event.c'),
+                'timeout' : 120,
+        },
+        {
+                'sources' : files('sd-journal/test-journal-enum.c'),
+                'timeout' : 360,
+        },
         {
                 'sources' : files('sd-journal/test-journal-append.c'),
                 'type' : 'manual',
@@ -287,11 +282,23 @@ libsystemd_tests += [
                 'sources' : files('sd-journal/test-journal-verify.c'),
                 'timeout' : 90,
         },
+        {
+                'sources' : files('sd-json/test-json.c'),
+                'dependencies' : libm,
+        },
         {
                 'sources' : files('sd-resolve/test-resolve.c'),
                 'dependencies' : threads,
                 'timeout' : 120,
         },
+        {
+                'sources' : files('sd-varlink/test-varlink.c'),
+                'dependencies' : threads,
+        },
+        {
+                'sources' : files('sd-varlink/test-varlink-idl.c'),
+                'dependencies' : threads,
+        },
 ]
 
 if cxx_cmd != ''

diff --git a/src/test/test-sd-hwdb.c b/src/libsystemd/sd-hwdb/test-sd-hwdb.c
similarity index 100%
rename from src/test/test-sd-hwdb.c
rename to src/libsystemd/sd-hwdb/test-sd-hwdb.c

diff --git a/src/test/test-id128.c b/src/libsystemd/sd-id128/test-id128.c
similarity index 100%
rename from src/test/test-id128.c
rename to src/libsystemd/sd-id128/test-id128.c

diff --git a/src/test/test-json.c b/src/libsystemd/sd-json/test-json.c
similarity index 100%
rename from src/test/test-json.c
rename to src/libsystemd/sd-json/test-json.c

diff --git a/src/test/test-sd-path.c b/src/libsystemd/sd-path/test-sd-path.c
similarity index 100%
rename from src/test/test-sd-path.c
rename to src/libsystemd/sd-path/test-sd-path.c

diff --git a/src/test/test-varlink-idl.c b/src/libsystemd/sd-varlink/test-varlink-idl.c
similarity index 100%
rename from src/test/test-varlink-idl.c
rename to src/libsystemd/sd-varlink/test-varlink-idl.c

diff --git a/src/test/test-varlink.c b/src/libsystemd/sd-varlink/test-varlink.c
similarity index 100%
rename from src/test/test-varlink.c
rename to src/libsystemd/sd-varlink/test-varlink.c

diff --git a/src/test/test-varlink-idl-util.h b/src/shared/test-varlink-idl-util.h
similarity index 100%
rename from src/test/test-varlink-idl-util.h
rename to src/shared/test-varlink-idl-util.h

diff --git a/src/test/meson.build b/src/test/meson.build
index 6f9a24eb044831e9cdd58c7bd12997a1b23a140c..09c367d3074f3484ad90fe0853246628dec74cb4 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -120,7 +120,6 @@ simple_tests += files(
         'test-hmac.c',
         'test-hostname-setup.c',
         'test-hostname-util.c',
-        'test-id128.c',
         'test-image-filter.c',
         'test-image-policy.c',
         'test-import-util.c',
@@ -180,8 +179,6 @@ simple_tests += files(
         'test-replace-var.c',
         'test-rlimit-util.c',
         'test-rm-rf.c',
-        'test-sd-hwdb.c',
-        'test-sd-path.c',
         'test-secure-bits.c',
         'test-serialize.c',
         'test-set.c',
@@ -346,10 +343,6 @@ executables += [
                 'sources' : files('test-ipcrm.c'),
                 'type' : 'unsafe',
         },
-        test_template + {
-                'sources' : files('test-json.c'),
-                'dependencies' : libm,
-        },
         test_template + {
                 'sources' : files('test-kexec.c'),
                 'link_with' : [libshared],
@@ -496,14 +489,6 @@ executables += [
                 'sources' : files('test-utmp.c'),
                 'conditions' : ['ENABLE_UTMP'],
         },
-        test_template + {
-                'sources' : files('test-varlink.c'),
-                'dependencies' : threads,
-        },
-        test_template + {
-                'sources' : files('test-varlink-idl.c'),
-                'dependencies' : threads,
-        },
         core_test_template + {
                 'sources' : files('test-varlink-idl-unit.c'),
         },