Skip to content

Commit a13c150

Browse files
authored
conditionally remove tests from cross build (#511)
1 parent f437c24 commit a13c150

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/luks/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,7 @@ else
7171
endif
7272

7373
# Tests.
74-
subdir('tests')
74+
75+
if not meson.is_cross_build()
76+
subdir('tests')
77+
endif

src/pins/pkcs11/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ if pcscd.found() and pkcs11tool.found()
2626
mans += join_paths(meson.current_source_dir(), 'clevis-encrypt-pkcs11.1')
2727
### TODO: Include man pages
2828
# mans += join_paths(meson.current_source_dir(), 'clevis-decrypt-pkcs11.1')
29-
subdir('tests')
29+
if not meson.is_cross_build()
30+
subdir('tests')
31+
endif
32+
3033
threads_dep = dependency('threads', required: true)
3134
executable('clevis-pkcs11-afunix-socket-unlock', ['clevis-pkcs11-afunix-socket-unlock.c'],
3235
dependencies: threads_dep,

src/pins/tang/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
curl = find_program('curl', required: false)
22

3-
if curl.found()
3+
if curl.found() or meson.is_cross_build()
44
bins += join_paths(meson.current_source_dir(), 'clevis-decrypt-tang')
55
bins += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang')
66
mans += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang.1')
77

8+
if not meson.is_cross_build()
89
subdir('tests')
10+
endif
911
else
1012
warning('Will not install tang pin due to missing dependencies!')
1113
endif

0 commit comments

Comments
 (0)