tests/tpm: Display if swtpm is not found or --tpm2 not supported
If swtpm is not found in $PATH or --tpm2 isn't supported, we display this in the test log. We cannot mark the test as skipped due to a bug in certain versions of the gtester environment that interprets a skipped test as failure. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
parent
c1d99200dd
commit
e2f246a50b
|
@ -18,6 +18,17 @@
|
||||||
#include "libqtest.h"
|
#include "libqtest.h"
|
||||||
#include "tpm-tests.h"
|
#include "tpm-tests.h"
|
||||||
|
|
||||||
|
static bool
|
||||||
|
tpm_test_swtpm_skip(void)
|
||||||
|
{
|
||||||
|
if (!tpm_util_swtpm_has_tpm2()) {
|
||||||
|
fprintf(stderr, "swtpm not in PATH or missing --tpm2 support; ");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
|
void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
|
||||||
const char *ifmodel)
|
const char *ifmodel)
|
||||||
{
|
{
|
||||||
|
@ -28,12 +39,13 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
|
||||||
GPid swtpm_pid;
|
GPid swtpm_pid;
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
|
|
||||||
succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);
|
if (tpm_test_swtpm_skip()) {
|
||||||
/* succ may be false if swtpm is not available */
|
|
||||||
if (!succ) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);
|
||||||
|
g_assert_true(succ);
|
||||||
|
|
||||||
args = g_strdup_printf(
|
args = g_strdup_printf(
|
||||||
"-chardev socket,id=chr,path=%s "
|
"-chardev socket,id=chr,path=%s "
|
||||||
"-tpmdev emulator,id=dev,chardev=chr "
|
"-tpmdev emulator,id=dev,chardev=chr "
|
||||||
|
@ -74,19 +86,17 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
QTestState *src_qemu, *dst_qemu;
|
QTestState *src_qemu, *dst_qemu;
|
||||||
|
|
||||||
succ = tpm_util_swtpm_start(src_tpm_path, &src_tpm_pid,
|
if (tpm_test_swtpm_skip()) {
|
||||||
&src_tpm_addr, &error);
|
|
||||||
/* succ may be false if swtpm is not available */
|
|
||||||
if (!succ) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
succ = tpm_util_swtpm_start(src_tpm_path, &src_tpm_pid,
|
||||||
|
&src_tpm_addr, &error);
|
||||||
|
g_assert_true(succ);
|
||||||
|
|
||||||
succ = tpm_util_swtpm_start(dst_tpm_path, &dst_tpm_pid,
|
succ = tpm_util_swtpm_start(dst_tpm_path, &dst_tpm_pid,
|
||||||
&dst_tpm_addr, &error);
|
&dst_tpm_addr, &error);
|
||||||
/* succ may be false if swtpm is not available */
|
g_assert_true(succ);
|
||||||
if (!succ) {
|
|
||||||
goto err_src_tpm_kill;
|
|
||||||
}
|
|
||||||
|
|
||||||
tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,
|
tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,
|
||||||
src_tpm_addr, dst_tpm_addr, uri,
|
src_tpm_addr, dst_tpm_addr, uri,
|
||||||
|
@ -118,7 +128,6 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
|
||||||
qapi_free_SocketAddress(dst_tpm_addr);
|
qapi_free_SocketAddress(dst_tpm_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
err_src_tpm_kill:
|
|
||||||
tpm_util_swtpm_kill(src_tpm_pid);
|
tpm_util_swtpm_kill(src_tpm_pid);
|
||||||
if (src_tpm_addr) {
|
if (src_tpm_addr) {
|
||||||
g_unlink(src_tpm_addr->u.q_unix.path);
|
g_unlink(src_tpm_addr->u.q_unix.path);
|
||||||
|
|
|
@ -145,7 +145,7 @@ void tpm_util_pcrread(QTestState *s, tx_func *tx,
|
||||||
g_assert_cmpmem(buffer, exp_resp_size, exp_resp, exp_resp_size);
|
g_assert_cmpmem(buffer, exp_resp_size, exp_resp, exp_resp_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool tpm_util_swtpm_has_tpm2(void)
|
bool tpm_util_swtpm_has_tpm2(void)
|
||||||
{
|
{
|
||||||
bool has_tpm2 = false;
|
bool has_tpm2 = false;
|
||||||
char *out = NULL;
|
char *out = NULL;
|
||||||
|
@ -190,11 +190,6 @@ gboolean tpm_util_swtpm_start(const char *path, GPid *pid,
|
||||||
gboolean succ;
|
gboolean succ;
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
|
||||||
succ = tpm_util_swtpm_has_tpm2();
|
|
||||||
if (!succ) {
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
*addr = g_new0(SocketAddress, 1);
|
*addr = g_new0(SocketAddress, 1);
|
||||||
(*addr)->type = SOCKET_ADDRESS_TYPE_UNIX;
|
(*addr)->type = SOCKET_ADDRESS_TYPE_UNIX;
|
||||||
(*addr)->u.q_unix.path = g_build_filename(path, "sock", NULL);
|
(*addr)->u.q_unix.path = g_build_filename(path, "sock", NULL);
|
||||||
|
@ -202,7 +197,6 @@ gboolean tpm_util_swtpm_start(const char *path, GPid *pid,
|
||||||
succ = g_spawn_async(NULL, swtpm_argv, NULL, G_SPAWN_SEARCH_PATH,
|
succ = g_spawn_async(NULL, swtpm_argv, NULL, G_SPAWN_SEARCH_PATH,
|
||||||
NULL, NULL, pid, error);
|
NULL, NULL, pid, error);
|
||||||
|
|
||||||
cleanup:
|
|
||||||
for (i = 0; swtpm_argv[i]; i++) {
|
for (i = 0; swtpm_argv[i]; i++) {
|
||||||
g_free(swtpm_argv[i]);
|
g_free(swtpm_argv[i]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,8 @@ void tpm_util_pcrextend(QTestState *s, tx_func *tx);
|
||||||
void tpm_util_pcrread(QTestState *s, tx_func *tx,
|
void tpm_util_pcrread(QTestState *s, tx_func *tx,
|
||||||
const unsigned char *exp_resp, size_t exp_resp_size);
|
const unsigned char *exp_resp, size_t exp_resp_size);
|
||||||
|
|
||||||
|
bool tpm_util_swtpm_has_tpm2(void);
|
||||||
|
|
||||||
gboolean tpm_util_swtpm_start(const char *path, GPid *pid,
|
gboolean tpm_util_swtpm_start(const char *path, GPid *pid,
|
||||||
SocketAddress **addr, GError **error);
|
SocketAddress **addr, GError **error);
|
||||||
void tpm_util_swtpm_kill(GPid pid);
|
void tpm_util_swtpm_kill(GPid pid);
|
||||||
|
|
Loading…
Reference in New Issue