[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 15/21] tests/qtest: use qos_printf instead of g_test_message
From: |
Alex Bennée |
Subject: |
[PATCH v3 15/21] tests/qtest: use qos_printf instead of g_test_message |
Date: |
Tue, 26 Jul 2022 20:21:44 +0100 |
The vhost-user tests respawn qos-test as a standalone process. As a
result the gtester framework squashes all messages coming out of it
which make it hard to debug. As the test does not care about asserting
certain messages just convert the tests to use the direct qos_printf.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/qtest/qos-test.c | 5 +++++
tests/qtest/vhost-user-test.c | 13 +++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/qos-test.c b/tests/qtest/qos-test.c
index ac23def284..d0bdf06fad 100644
--- a/tests/qtest/qos-test.c
+++ b/tests/qtest/qos-test.c
@@ -320,6 +320,11 @@ static void walk_path(QOSGraphNode *orig_path, int len)
int main(int argc, char **argv, char** envp)
{
g_test_init(&argc, &argv, NULL);
+
+ if (g_test_subprocess()) {
+ qos_printf("qos_test running single test in subprocess\n");
+ }
+
if (g_test_verbose()) {
qos_printf("ENVIRONMENT VARIABLES: {\n");
for (char **env = envp; *env != 0; env++) {
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index 8bf390be20..968113d591 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -26,6 +26,7 @@
#include "libqos/virtio-pci.h"
#include "libqos/malloc-pc.h"
+#include "libqos/qgraph_internal.h"
#include "hw/virtio/virtio-net.h"
#include "standard-headers/linux/vhost_types.h"
@@ -316,7 +317,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int
size)
}
if (size != VHOST_USER_HDR_SIZE) {
- g_test_message("Wrong message size received %d", size);
+ qos_printf("%s: Wrong message size received %d\n", __func__, size);
return;
}
@@ -327,8 +328,8 @@ static void chr_read(void *opaque, const uint8_t *buf, int
size)
p += VHOST_USER_HDR_SIZE;
size = qemu_chr_fe_read_all(chr, p, msg.size);
if (size != msg.size) {
- g_test_message("Wrong message size received %d != %d",
- size, msg.size);
+ qos_printf("%s: Wrong message size received %d != %d\n",
+ __func__, size, msg.size);
return;
}
}
@@ -450,7 +451,7 @@ static const char *init_hugepagefs(void)
}
if (access(path, R_OK | W_OK | X_OK)) {
- g_test_message("access on path (%s): %s", path, strerror(errno));
+ qos_printf("access on path (%s): %s", path, strerror(errno));
g_test_fail();
return NULL;
}
@@ -460,13 +461,13 @@ static const char *init_hugepagefs(void)
} while (ret != 0 && errno == EINTR);
if (ret != 0) {
- g_test_message("statfs on path (%s): %s", path, strerror(errno));
+ qos_printf("statfs on path (%s): %s", path, strerror(errno));
g_test_fail();
return NULL;
}
if (fs.f_type != HUGETLBFS_MAGIC) {
- g_test_message("Warning: path not on HugeTLBFS: %s", path);
+ qos_printf("Warning: path not on HugeTLBFS: %s", path);
g_test_fail();
return NULL;
}
--
2.30.2
- [PATCH v3 for 7.2 00/21] virtio-gpio and various virtio cleanups, Alex Bennée, 2022/07/26
- [PATCH v3 01/21] include/hw/virtio: more comment for VIRTIO_F_BAD_FEATURE, Alex Bennée, 2022/07/26
- [PATCH v3 02/21] include/hw: document vhost_dev feature life-cycle, Alex Bennée, 2022/07/26
- [PATCH v3 03/21] hw/virtio: fix some coding style issues, Alex Bennée, 2022/07/26
- [PATCH v3 15/21] tests/qtest: use qos_printf instead of g_test_message,
Alex Bennée <=
- [PATCH v3 06/21] hw/virtio: incorporate backend features in features, Alex Bennée, 2022/07/26
- [PATCH v3 20/21] tests/qtest: add a get_features op to vhost-user-test, Alex Bennée, 2022/07/26
- [PATCH v3 04/21] hw/virtio: log potentially buggy guest drivers, Alex Bennée, 2022/07/26
- [PATCH v3 05/21] block/vhost-user-blk-server: don't expose VHOST_USER_F_PROTOCOL_FEATURES, Alex Bennée, 2022/07/26
- [PATCH v3 07/21] hw/virtio: gracefully handle unset vhost_dev vdev, Alex Bennée, 2022/07/26
- [PATCH v3 08/21] hw/virtio: handle un-configured shutdown in virtio-pci, Alex Bennée, 2022/07/26