[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 8/8] meson-build: test-crypto-secret depends on CONFIG_SECRET
From: |
Daniel P . Berrangé |
Subject: |
Re: [PATCH 8/8] meson-build: test-crypto-secret depends on CONFIG_SECRET_KEYRING |
Date: |
Tue, 20 Sep 2022 09:06:46 +0100 |
User-agent: |
Mutt/2.2.6 (2022-06-05) |
On Fri, Sep 02, 2022 at 06:51:26PM +0200, Juan Quintela wrote:
> With this change "make check" works when configured with --disable-keyring.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> tests/unit/meson.build | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tests/unit/meson.build b/tests/unit/meson.build
> index b497a41378..988aed27cb 100644
> --- a/tests/unit/meson.build
> +++ b/tests/unit/meson.build
> @@ -78,7 +78,6 @@ if have_block
> 'test-crypto-hmac': [crypto],
> 'test-crypto-cipher': [crypto],
> 'test-crypto-akcipher': [crypto],
> - 'test-crypto-secret': [crypto, keyutils],
> 'test-crypto-der': [crypto],
> 'test-authz-simple': [authz],
> 'test-authz-list': [authz],
> @@ -122,6 +121,9 @@ if have_block
> if config_host_data.get('CONFIG_EPOLL_CREATE1')
> tests += {'test-fdmon-epoll': [testblock]}
> endif
> + if config_host_data.get('CONFIG_SECRET_KEYRING')
> + tests += {'test-crypto-secret': [crypto, keyutils]}
> + endif
> endif
This is not right, as it disables testing on all non-Linux platforms.
The code in test-crypto-secret is already conditional on CONFIG_KEYUTILS
so it can run on all platforms. The code just needs changing to be using
CONFIG_SECRET_KEYRING instead of CONFIG_KEYUTILS as the former is more
general. Don't touch the meson rules at all.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
- Re: [PATCH 1/8] qtest: "-display none" is set in qtest_init(), (continued)
- [PATCH 3/8] tests/acpi: The new default is -vga none, Juan Quintela, 2022/09/02
- [PATCH 4/8] tests/qtest: Add -vga none by default, Juan Quintela, 2022/09/02
- [PATCH 5/8] tests/acpi: Regenerate all needed tables, Juan Quintela, 2022/09/02
- [PATCH 6/8] tests: Fix error strings, Juan Quintela, 2022/09/02
- [PATCH 7/8] meson-build: Enable CONFIG_REPLICATION only when replication is set, Juan Quintela, 2022/09/02
- [PATCH 8/8] meson-build: test-crypto-secret depends on CONFIG_SECRET_KEYRING, Juan Quintela, 2022/09/02
- Re: [PATCH 0/8] tests: Make expliction defaults for tests, Alexander Bulekov, 2022/09/02