[2/2] tests/tpm: mark swtpm test as skipped instead of successful

If swtpm is not found in $PATH or --tpm2 isn't supported, let's mark
the test as SKIP.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/tpm-util.h  |  2 ++
 tests/tpm-tests.c | 33 +++++++++++++++++++++------------
 tests/tpm-util.c  |  8 +-------
 3 files changed, 24 insertions(+), 19 deletions(-)

On 10/3/18 9:21 AM, Marc-André Lureau wrote:
> If swtpm is not found in $PATH or --tpm2 isn't supported, let's mark
> the test as SKIP.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   tests/tpm-util.h  |  2 ++
>   tests/tpm-tests.c | 33 +++++++++++++++++++++------------
>   tests/tpm-util.c  |  8 +-------
>   3 files changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/tests/tpm-util.h b/tests/tpm-util.h
> index 330b9657fe..9e98bc5124 100644
> --- a/tests/tpm-util.h
> +++ b/tests/tpm-util.h
> @@ -32,6 +32,8 @@ void tpm_util_pcrextend(QTestState *s, tx_func *tx);
>   void tpm_util_pcrread(QTestState *s, tx_func *tx,
>                         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,
>                                 SocketAddress **addr, GError **error);
>   void tpm_util_swtpm_kill(GPid pid);
> diff --git a/tests/tpm-tests.c b/tests/tpm-tests.c
> index 10c6592aac..e640777aa9 100644
> --- a/tests/tpm-tests.c
> +++ b/tests/tpm-tests.c
> @@ -18,6 +18,17 @@
>   #include "libqtest.h"
>   #include "tpm-tests.h"
>
> +static bool
> +tpm_test_swtpm_skip(void)
> +{
> +    if (!tpm_util_swtpm_has_tpm2()) {
> +        g_test_skip("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,
>                            const char *ifmodel)
>   {
> @@ -28,12 +39,13 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
>       GPid swtpm_pid;
>       GError *error = NULL;
>
> -    succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);
> -    /* succ may be false if swtpm is not available */
> -    if (!succ) {
> +    if (tpm_test_swtpm_skip()) {
>           return;
>       }
>
> +    succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);
> +    g_assert_true(succ);
> +
>       args = g_strdup_printf(
>           "-chardev socket,id=chr,path=%s "
>           "-tpmdev emulator,id=dev,chardev=chr "
> @@ -74,19 +86,17 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
>       GError *error = NULL;
>       QTestState *src_qemu, *dst_qemu;
>
> -    succ = tpm_util_swtpm_start(src_tpm_path, &src_tpm_pid,
> -                                &src_tpm_addr, &error);
> -    /* succ may be false if swtpm is not available */
> -    if (!succ) {
> +    if (tpm_test_swtpm_skip()) {
>           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,
>                                   &dst_tpm_addr, &error);
> -    /* succ may be false if swtpm is not available */
> -    if (!succ) {
> -        goto err_src_tpm_kill;
> -    }
> +    g_assert_true(succ);
>
>       tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,
>                                     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);
>       }
>
> -err_src_tpm_kill:
>       tpm_util_swtpm_kill(src_tpm_pid);
>       if (src_tpm_addr) {
>           g_unlink(src_tpm_addr->u.q_unix.path);
> diff --git a/tests/tpm-util.c b/tests/tpm-util.c
> index ae4aaf35ca..e08b137651 100644
> --- a/tests/tpm-util.c
> +++ b/tests/tpm-util.c
> @@ -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);
>   }
>
> -static bool tpm_util_swtpm_has_tpm2(void)
> +bool tpm_util_swtpm_has_tpm2(void)
>   {
>       bool has_tpm2 = false;
>       char *out = NULL;
> @@ -190,11 +190,6 @@ gboolean tpm_util_swtpm_start(const char *path, GPid *pid,
>       gboolean succ;
>       unsigned i;
>
> -    succ = tpm_util_swtpm_has_tpm2();
> -    if (!succ) {
> -        goto cleanup;
> -    }
> -
>       *addr = g_new0(SocketAddress, 1);
>       (*addr)->type = SOCKET_ADDRESS_TYPE_UNIX;
>       (*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,
>                            NULL, NULL, pid, error);
>
> -cleanup:
>       for (i = 0; swtpm_argv[i]; i++) {
>           g_free(swtpm_argv[i]);
>       }

Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>