tests: Run the luks tests in test-crypto-block only if encryption is available
PATCH v2 1/1 tests: Run the luks tests in test-crypto-block only if encryption is available
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.
---
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(-)
tests/test-crypto-block.c +2 -1
@@ -28,7 +28,8 @@#include <sys/resource.h> #endif -#if (defined(_WIN32) || definedRUSAGE_THREAD ) +#if (defined(_WIN32) || definedRUSAGE_THREAD ) && \ + (defined(CONFIG_NETTLE_KDF ) || defined(CONFIG_GCRYPT_KDF ))#define TEST_LUKS #else #undef TEST_LUKS
Signature · 1 line
1.8.3.1
Quoted 24 lines · Thomas Huth
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 inqcrypto_pbkdf2()atqemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02Sbbb5b6f299c6727f41bb50ba4aa6ef5c (pid=22237)
/crypto/block/luks/aes-256-cbc-plain64:
Unexpected error inqcrypto_pbkdf2()atqemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02S3e27992a5ab4cc95e141c4ed3c7f0d2e (pid=22239)
/crypto/block/luks/aes-256-cbc-essiv:
Unexpected error inqcrypto_pbkdf2()atqemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02S51b52bb02a66c42d8b331fd305384f53 (pid=22241)
FAIL: tests/test-crypto-blockSo run the luks test only if the required encryption support is available.
Quoted 7 lines
Signed-off-by Thomas Huth <[email protected]>---
v2: Added the check toTEST_LUKSin 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(-)
Regards,
Daniel
Signature · 3 lines
|: 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 :|