| Message ID | 1509710092-31645-1-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Nov 03, 2017 at 12:54:52PM +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 the luks test only if the required encryption support is available. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: Added the check to TEST_LUKS in the .c file instead of disabling > test-crypto-block completely in the Makefile.include. > > tests/test-crypto-block.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Acked-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c index bd7fe59..fd29a04 100644 --- a/tests/test-crypto-block.c +++ b/tests/test-crypto-block.c @@ -28,7 +28,8 @@ #include <sys/resource.h> #endif -#if (defined(_WIN32) || defined RUSAGE_THREAD) +#if (defined(_WIN32) || defined RUSAGE_THREAD) && \ + (defined(CONFIG_NETTLE_KDF) || defined(CONFIG_GCRYPT_KDF)) #define TEST_LUKS #else #undef TEST_LUKS
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 the luks test only if the required encryption support is available. Signed-off-by: Thomas Huth <thuth@redhat.com> --- v2: Added the check to TEST_LUKS in the .c file instead of disabling test-crypto-block completely in the Makefile.include. tests/test-crypto-block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)