]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: stop using nested lists for sources
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Mar 2023 09:35:05 +0000 (10:35 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 7 Jun 2023 14:15:51 +0000 (16:15 +0200)
meson itself flattens the list when it is used in "sources:" field, but it
makes our own processing more complicated. I find it also a bit confusing.

src/test/meson.build

index fe1a0fec216594d30664ca452131511be9a83782..b57ba235394e2a9055f5bdbcf9158f3c23561f01 100644 (file)
@@ -200,16 +200,12 @@ tests += [
                 'condition' : 'HAVE_ACL',
         },
         {
-                'sources' : [
-                        files('test-af-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-af-list.c') +
+                            generated_gperf_headers,
         },
         {
-                'sources' : [
-                        files('test-arphrd-util.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-arphrd-util.c') +
+                            generated_gperf_headers,
         },
         {
                 'sources' : files('test-ask-password-api.c'),
@@ -228,10 +224,8 @@ tests += [
                 'type' : 'manual',
         },
         {
-                'sources' : [
-                        files('test-cap-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-cap-list.c') +
+                            generated_gperf_headers,
                 'dependencies' : libcap,
         },
         {
@@ -268,28 +262,25 @@ tests += [
                 'dependencies' : libp11kit_cflags
         },
         {
-                'sources' : [
-                        files('test-errno-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-errno-list.c') +
+                            generated_gperf_headers,
         },
         {
                 'sources' : files('test-fd-util.c'),
                 'dependencies' : libseccomp,
         },
         {
-                'sources' : [files(
-                        'test-hashmap.c',
-                        'test-hashmap-plain.c'),
-                        test_hashmap_ordered_c,
-                ],
+                'sources' : files(
+                                  'test-hashmap.c',
+                                  'test-hashmap-plain.c',
+                            ) + [
+                                   test_hashmap_ordered_c,
+                            ],
                 'timeout' : 180,
         },
         {
-                'sources' : [
-                        files('test-ip-protocol-list.c'),
-                        shared_generated_gperf_headers,
-                ],
+                'sources' : files('test-ip-protocol-list.c') +
+                            shared_generated_gperf_headers,
         },
         {
                 'sources' : files('test-ipcrm.c'),