Re: [Qemu-trivial] [PATCH] tests: Run the test-crypto-block only if encryption is available

[Daniel P. Berrange]

On Fri, Nov 03, 2017 at 10:39:13AM +0100, Thomas Huth wrote:
> The test-crypto-block currently fails if encryption has not been
> compiled into QEMU:
> 
> TEST: tests/test-crypto-block... (pid=22231)
>   /crypto/block/qcow:                                                  OK
>   /crypto/block/luks/default:
>   Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
> FAIL
> GTester: last random seed: R02Sbbb5b6f299c6727f41bb50ba4aa6ef5c
> (pid=22237)
>   /crypto/block/luks/aes-256-cbc-plain64:
>   Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
> FAIL
> GTester: last random seed: R02S3e27992a5ab4cc95e141c4ed3c7f0d2e
> (pid=22239)
>   /crypto/block/luks/aes-256-cbc-essiv:
>   Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
> FAIL
> GTester: last random seed: R02S51b52bb02a66c42d8b331fd305384f53
> (pid=22241)
> FAIL: tests/test-crypto-block
> 
> So run this test only if the required encryption support is available.
> 
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  tests/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 434a2ce..ac46aea 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -145,7 +145,7 @@ check-unit-$(if 
> $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypt
>  check-unit-y += tests/test-crypto-ivgen$(EXESUF)
>  check-unit-y += tests/test-crypto-afsplit$(EXESUF)
>  check-unit-y += tests/test-crypto-xts$(EXESUF)
> -check-unit-y += tests/test-crypto-block$(EXESUF)
> +check-unit-$(call lor,$(CONFIG_NETTLE_KDF),$(CONFIG_GCRYPT_KDF)) += 
> tests/test-crypto-block$(EXESUF)

This is disabling the entire test suite, even though only the LUKS part of
the test suite has problems. Can you just extend the logic for setting the
TEST_LUKS condition in the test source code instad. 

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 :|