Skip to content

conditionally remove tests from cross build #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergio-correia merged 3 commits into from
Mar 7, 2025
Merged

conditionally remove tests from cross build #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a06d62f
conditionally remove tests from cross build
n80fr1n60 Feb 24, 2025
5964194
excluded tests from cross builds
n80fr1n60 Mar 3, 2025
3f1e859
Merge branch 'latchset:master' into master
n80fr1n60 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/luks/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,7 @@ else
endif

# Tests.
subdir('tests')

if not meson.is_cross_build()
subdir('tests')
endif
5 changes: 4 additions & 1 deletion src/pins/pkcs11/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ if pcscd.found() and pkcs11tool.found()
mans += join_paths(meson.current_source_dir(), 'clevis-encrypt-pkcs11.1')
### TODO: Include man pages
# mans += join_paths(meson.current_source_dir(), 'clevis-decrypt-pkcs11.1')
subdir('tests')
if not meson.is_cross_build()
subdir('tests')
endif

threads_dep = dependency('threads', required: true)
executable('clevis-pkcs11-afunix-socket-unlock', ['clevis-pkcs11-afunix-socket-unlock.c'],
dependencies: threads_dep,
Expand Down
4 changes: 3 additions & 1 deletion src/pins/tang/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
curl = find_program('curl', required: false)

if curl.found()
if curl.found() or meson.is_cross_build()
Copy link
Contributor Author

@n80fr1n60 n80fr1n60 Mar 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

locally the cross build sysroot fs does not have "curl" command but embedded device has curl
-> any recommendation for a cleaner solution ?

Copy link
Collaborator

@sergio-correia sergio-correia Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this looks okay. Not great, but not too bad either. @sarroutbi: any opinions here?

Copy link
Collaborator

@sarroutbi sarroutbi Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks

bins += join_paths(meson.current_source_dir(), 'clevis-decrypt-tang')
bins += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang')
mans += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang.1')

if not meson.is_cross_build()
subdir('tests')
endif
else
warning('Will not install tang pin due to missing dependencies!')
endif