X Tutup
Skip to content

Commit e1eeebb

Browse files
medhefgomedhefgo
committed
meson: Use files() for tests
Not having to provide the full path in the source tree is much nicer and the produced lists can also be used anywhere in the source tree.
1 parent a1a03fa commit e1eeebb

File tree

23 files changed

+308
-307
lines changed

23 files changed

+308
-307
lines changed

‎meson.build‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3588,7 +3588,8 @@ foreach tuple : tests
35883588
parallel = tuple.length() > 7 ? tuple[7] : true
35893589
timeout = 30
35903590

3591-
name = sources[0].split('/')[-1].split('.')[0]
3591+
# FIXME: Use fs.stem() with meson >= 0.54.0
3592+
name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0]
35923593
if type.startswith('timeout=')
35933594
timeout = type.split('=')[1].to_int()
35943595
type = ''

‎src/analyze/meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ systemd_analyze_sources = files('''
1313
'''.split())
1414

1515
tests += [
16-
[['src/analyze/test-verify.c',
17-
'src/analyze/analyze-verify.c',
18-
'src/analyze/analyze-verify.h'],
16+
[files('test-verify.c',
17+
'analyze-verify.c',
18+
'analyze-verify.h'),
1919
[libcore,
2020
libshared],
2121
[],

‎src/boot/efi/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ endif
352352
if efi_arch[1] in ['ia32', 'x86_64', 'arm', 'aarch64']
353353
systemd_boot_sources += files('bcd.c')
354354
tests += [
355-
[['src/boot/efi/test-bcd.c'],
355+
[files('test-bcd.c'),
356356
[],
357357
[libzstd],
358358
[],

‎src/busctl/meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ busctl_sources = files(
66
'busctl.c')
77

88
tests += [
9-
[['src/busctl/test-busctl-introspect.c',
10-
'src/busctl/busctl-introspect.c',
11-
'src/busctl/busctl-introspect.h']],
9+
[files('test-busctl-introspect.c',
10+
'busctl-introspect.c',
11+
'busctl-introspect.h')],
1212
]

‎src/coredump/meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ if conf.get('ENABLE_COREDUMP') == 1 and install_sysconfdir_samples
1414
endif
1515

1616
tests += [
17-
[['src/coredump/test-coredump-vacuum.c',
18-
'src/coredump/coredump-vacuum.c',
19-
'src/coredump/coredump-vacuum.h'],
17+
[files('test-coredump-vacuum.c',
18+
'coredump-vacuum.c',
19+
'coredump-vacuum.h'),
2020
[], [], [], '', 'manual'],
2121
]

‎src/import/meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ if conf.get('ENABLE_IMPORTD') == 1
6161
endif
6262

6363
tests += [
64-
[['src/import/test-qcow2.c',
65-
'src/import/qcow2-util.c',
66-
'src/import/qcow2-util.h'],
64+
[files('test-qcow2.c',
65+
'qcow2-util.c',
66+
'qcow2-util.h'),
6767
[],
6868
[libz],
6969
[], 'HAVE_ZLIB', 'manual'],

‎src/journal/meson.build‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,38 @@ endif
8181
############################################################
8282

8383
tests += [
84-
[['src/journal/test-journal-syslog.c'],
84+
[files('test-journal-syslog.c'),
8585
[libjournal_core,
8686
libshared],
8787
[threads,
8888
libxz,
8989
liblz4,
9090
libselinux]],
9191

92-
[['src/journal/test-journal-config.c'],
92+
[files('test-journal-config.c'),
9393
[libjournal_core,
9494
libshared],
9595
[libxz,
9696
liblz4,
9797
libselinux]],
9898

99-
[['src/journal/test-journal.c'],
99+
[files('test-journal.c'),
100100
[libjournal_core,
101101
libshared]],
102102

103-
[['src/journal/test-journal-stream.c'],
103+
[files('test-journal-stream.c'),
104104
[libjournal_core,
105105
libshared]],
106106

107-
[['src/journal/test-journal-flush.c'],
107+
[files('test-journal-flush.c'),
108108
[libjournal_core,
109109
libshared]],
110110

111-
[['src/journal/test-journal-verify.c'],
111+
[files('test-journal-verify.c'),
112112
[libjournal_core,
113113
libshared]],
114114

115-
[['src/journal/test-journal-interleaving.c'],
115+
[files('test-journal-interleaving.c'),
116116
[libjournal_core,
117117
libshared]],
118118
]

‎src/libsystemd-network/meson.build‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,49 +57,49 @@ libsystemd_network_includes = [includes, include_directories('.')]
5757
############################################################
5858

5959
tests += [
60-
[['src/libsystemd-network/test-dhcp-option.c'],
60+
[files('test-dhcp-option.c'),
6161
[libshared,
6262
libsystemd_network]],
6363

64-
[['src/libsystemd-network/test-sd-dhcp-lease.c'],
64+
[files('test-sd-dhcp-lease.c'),
6565
[libshared,
6666
libsystemd_network]],
6767

68-
[['src/libsystemd-network/test-dhcp-client.c'],
68+
[files('test-dhcp-client.c'),
6969
[libshared,
7070
libsystemd_network]],
7171

72-
[['src/libsystemd-network/test-dhcp-server.c'],
72+
[files('test-dhcp-server.c'),
7373
[libshared,
7474
libsystemd_network]],
7575

76-
[['src/libsystemd-network/test-ipv4ll.c'],
76+
[files('test-ipv4ll.c'),
7777
[libshared,
7878
libsystemd_network]],
7979

80-
[['src/libsystemd-network/test-ipv4ll-manual.c'],
80+
[files('test-ipv4ll-manual.c'),
8181
[libshared,
8282
libsystemd_network],
8383
[], [], '', 'manual'],
8484

85-
[['src/libsystemd-network/test-acd.c'],
85+
[files('test-acd.c'),
8686
[libshared,
8787
libsystemd_network],
8888
[], [], '', 'manual'],
8989

90-
[['src/libsystemd-network/test-ndisc-rs.c'],
90+
[files('test-ndisc-rs.c'),
9191
[libshared,
9292
libsystemd_network]],
9393

94-
[['src/libsystemd-network/test-ndisc-ra.c'],
94+
[files('test-ndisc-ra.c'),
9595
[libshared,
9696
libsystemd_network]],
9797

98-
[['src/libsystemd-network/test-dhcp6-client.c'],
98+
[files('test-dhcp6-client.c'),
9999
[libshared,
100100
libsystemd_network]],
101101

102-
[['src/libsystemd-network/test-lldp-rx.c'],
102+
[files('test-lldp-rx.c'),
103103
[libshared,
104104
libsystemd_network]],
105105
]

‎src/libsystemd/meson.build‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -190,126 +190,126 @@ custom_target(
190190
############################################################
191191

192192
tests += [
193-
[['src/libsystemd/sd-journal/test-journal-send.c']],
193+
[files('sd-journal/test-journal-send.c')],
194194

195-
[['src/libsystemd/sd-journal/test-journal-match.c']],
195+
[files('sd-journal/test-journal-match.c')],
196196

197-
[['src/libsystemd/sd-journal/test-journal-enum.c'],
197+
[files('sd-journal/test-journal-enum.c'),
198198
[], [], [], '', 'timeout=360'],
199199

200-
[['src/libsystemd/sd-journal/test-journal-init.c']],
200+
[files('sd-journal/test-journal-init.c')],
201201

202-
[['src/libsystemd/sd-journal/test-mmap-cache.c']],
202+
[files('sd-journal/test-mmap-cache.c')],
203203

204-
[['src/libsystemd/sd-journal/test-catalog.c']],
204+
[files('sd-journal/test-catalog.c')],
205205

206-
[['src/libsystemd/sd-journal/test-compress.c'],
206+
[files('sd-journal/test-compress.c'),
207207
[],
208208
[liblz4,
209209
libzstd,
210210
libxz]],
211211

212-
[['src/libsystemd/sd-journal/test-compress-benchmark.c'],
212+
[files('sd-journal/test-compress-benchmark.c'),
213213
[],
214214
[liblz4,
215215
libzstd,
216216
libxz],
217217
[], '', 'timeout=90'],
218218

219-
[['src/libsystemd/sd-journal/test-audit-type.c']],
219+
[files('sd-journal/test-audit-type.c')],
220220
]
221221

222222
############################################################
223223

224224
tests += [
225-
[['src/libsystemd/sd-bus/test-bus-address.c'],
225+
[files('sd-bus/test-bus-address.c'),
226226
[],
227227
[threads]],
228228

229-
[['src/libsystemd/sd-bus/test-bus-marshal.c'],
229+
[files('sd-bus/test-bus-marshal.c'),
230230
[],
231231
[threads,
232232
libglib,
233233
libgobject,
234234
libgio,
235235
libdbus]],
236236

237-
[['src/libsystemd/sd-bus/test-bus-signature.c'],
237+
[files('sd-bus/test-bus-signature.c'),
238238
[],
239239
[threads]],
240240

241-
[['src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c'],
241+
[files('sd-bus/test-bus-queue-ref-cycle.c'),
242242
[],
243243
[threads]],
244244

245-
[['src/libsystemd/sd-bus/test-bus-watch-bind.c'],
245+
[files('sd-bus/test-bus-watch-bind.c'),
246246
[],
247247
[threads],
248248
[], '', 'timeout=120'],
249249

250-
[['src/libsystemd/sd-bus/test-bus-chat.c'],
250+
[files('sd-bus/test-bus-chat.c'),
251251
[],
252252
[threads]],
253253

254-
[['src/libsystemd/sd-bus/test-bus-cleanup.c'],
254+
[files('sd-bus/test-bus-cleanup.c'),
255255
[],
256256
[threads,
257257
libseccomp]],
258258

259-
[['src/libsystemd/sd-bus/test-bus-track.c'],
259+
[files('sd-bus/test-bus-track.c'),
260260
[],
261261
[libseccomp]],
262262

263-
[['src/libsystemd/sd-bus/test-bus-server.c'],
263+
[files('sd-bus/test-bus-server.c'),
264264
[],
265265
[threads]],
266266

267-
[['src/libsystemd/sd-bus/test-bus-objects.c'],
267+
[files('sd-bus/test-bus-objects.c'),
268268
[],
269269
[threads]],
270270

271-
[['src/libsystemd/sd-bus/test-bus-vtable.c',
272-
'src/libsystemd/sd-bus/test-vtable-data.h']],
271+
[files('sd-bus/test-bus-vtable.c',
272+
'sd-bus/test-vtable-data.h')],
273273

274-
[['src/libsystemd/sd-bus/test-bus-gvariant.c'],
274+
[files('sd-bus/test-bus-gvariant.c'),
275275
[],
276276
[libglib,
277277
libgobject,
278278
libgio]],
279279

280-
[['src/libsystemd/sd-bus/test-bus-creds.c']],
280+
[files('sd-bus/test-bus-creds.c')],
281281

282-
[['src/libsystemd/sd-bus/test-bus-match.c']],
282+
[files('sd-bus/test-bus-match.c')],
283283

284-
[['src/libsystemd/sd-bus/test-bus-benchmark.c'],
284+
[files('sd-bus/test-bus-benchmark.c'),
285285
[],
286286
[threads],
287287
[], '', 'manual'],
288288

289-
[['src/libsystemd/sd-bus/test-bus-introspect.c',
290-
'src/libsystemd/sd-bus/test-vtable-data.h']],
289+
[files('sd-bus/test-bus-introspect.c',
290+
'sd-bus/test-vtable-data.h')],
291291

292-
[['src/libsystemd/sd-event/test-event.c']],
292+
[files('sd-event/test-event.c')],
293293

294-
[['src/libsystemd/sd-netlink/test-netlink.c']],
294+
[files('sd-netlink/test-netlink.c')],
295295

296-
[['src/libsystemd/sd-resolve/test-resolve.c'],
296+
[files('sd-resolve/test-resolve.c'),
297297
[],
298298
[threads],
299299
[], '', 'timeout=120'],
300300

301-
[['src/libsystemd/sd-login/test-login.c']],
301+
[files('sd-login/test-login.c')],
302302

303-
[['src/libsystemd/sd-device/test-sd-device.c']],
303+
[files('sd-device/test-sd-device.c')],
304304

305-
[['src/libsystemd/sd-device/test-device-util.c']],
305+
[files('sd-device/test-device-util.c')],
306306

307-
[['src/libsystemd/sd-device/test-sd-device-monitor.c']],
307+
[files('sd-device/test-sd-device-monitor.c')],
308308
]
309309

310310
if cxx_cmd != ''
311311
tests += [
312-
[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc']],
312+
[files('sd-bus/test-bus-vtable-cc.cc')],
313313
]
314314
endif
315315

‎src/libudev/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ custom_target(
4545
############################################################
4646

4747
tests += [
48-
[['src/libudev/test-libudev.c'],
48+
[files('test-libudev.c'),
4949
[libshared,
5050
libudev_basic]],
5151
]

0 commit comments

Comments
 (0)
X Tutup