Le ven. 28 août 2020 13:11, <marcandre.lureau@redhat.com> a écrit :
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> As this makes the TAP output invalid. Use g_test_message().
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
> tests/benchmark-crypto-cipher.c | 8 ++++----
> tests/benchmark-crypto-hash.c | 2 +-
> tests/benchmark-crypto-hmac.c | 8 ++++----
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/benchmark-crypto-cipher.c
> b/tests/benchmark-crypto-cipher.c
> index 53032334ec..1936aa4ae0 100644
> --- a/tests/benchmark-crypto-cipher.c
> +++ b/tests/benchmark-crypto-cipher.c
> @@ -70,8 +70,8 @@ static void test_cipher_speed(size_t chunk_size,
> }
> g_test_timer_elapsed();
>
> - g_print("Enc chunk %zu bytes ", chunk_size);
> - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last());
> + g_test_message("Enc chunk %zu bytes ", chunk_size);
> + g_test_message("%.2f MB/sec ", (double)total / MiB /
> g_test_timer_last());
>
> g_test_timer_start();
> remain = total;
> @@ -85,8 +85,8 @@ static void test_cipher_speed(size_t chunk_size,
> }
> g_test_timer_elapsed();
>
> - g_print("Dec chunk %zu bytes ", chunk_size);
> - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last());
> + g_test_message("Dec chunk %zu bytes ", chunk_size);
> + g_test_message("%.2f MB/sec ", (double)total / MiB /
> g_test_timer_last());
>
> qcrypto_cipher_free(cipher);
> g_free(plaintext);
> diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
> index d16837d00a..598111e75a 100644
> --- a/tests/benchmark-crypto-hash.c
> +++ b/tests/benchmark-crypto-hash.c
> @@ -48,7 +48,7 @@ static void test_hash_speed(const void *opaque)
> }
> g_test_timer_elapsed();
>
> - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last());
> + g_test_message("%.2f MB/sec ", (double)total / MiB /
> g_test_timer_last());
>
> g_free(out);
> g_free(in);
> diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
> index f1dfa240cb..f9fa22df95 100644
> --- a/tests/benchmark-crypto-hmac.c
> +++ b/tests/benchmark-crypto-hmac.c
> @@ -55,10 +55,10 @@ static void test_hmac_speed(const void *opaque)
> } while (g_test_timer_elapsed() < 5.0);
>
> total /= MiB;
> - g_print("hmac(sha256): ");
> - g_print("Testing chunk_size %zu bytes ", chunk_size);
> - g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
> - g_print("%.2f MB/sec\n", total / g_test_timer_last());
> + g_test_message("hmac(sha256): ");
> + g_test_message("Testing chunk_size %zu bytes ", chunk_size);
> + g_test_message("done: %.2f MB in %.2f secs: ", total,
> g_test_timer_last());
> + g_test_message("%.2f MB/sec\n", total / g_test_timer_last());
>
> g_free(out);
> g_free(in);
> --
> 2.26.2
>
>
>