aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@suse.de>2023-10-18 16:27:41 -0300
committerJuan Quintela <quintela@redhat.com>2023-10-20 08:51:41 +0200
commit7789331b03ae3bffcb2de925a093796b3b9907ff (patch)
treea8b44efc54538eae2bf2a8d1c8c0a05fd0c8be75 /tests
parent6c6d2330a07d8a1ba1c1613d8631599a072c5544 (diff)
tests/qtest: Don't print messages from query instances
Now that we can query more than one binary, the "starting QEMU..." message can get a little noisy. Mute those messages unless we're running with --verbose. Only affects qtest_init() calls from within libqtest. The tests continue to output as usual. Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Fabiano Rosas <farosas@suse.de> Message-ID: <20231018192741.25885-13-farosas@suse.de> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qtest/libqtest.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index c843c41188..f33a210861 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -91,6 +91,7 @@ struct QTestState
static GHookList abrt_hooks;
static void (*sighandler_old)(int);
+static bool silence_spawn_log;
static int qtest_query_target_endianness(QTestState *s);
@@ -405,7 +406,9 @@ static QTestState *G_GNUC_PRINTF(2, 3) qtest_spawn_qemu(const char *qemu_bin,
qtest_add_abrt_handler(kill_qemu_hook_func, s);
- g_test_message("starting QEMU: %s", command->str);
+ if (!silence_spawn_log) {
+ g_test_message("starting QEMU: %s", command->str);
+ }
#ifndef _WIN32
s->qemu_pid = fork();
@@ -1508,6 +1511,8 @@ static struct MachInfo *qtest_get_machines(const char *var)
return machines;
}
+ silence_spawn_log = !g_test_verbose();
+
qts = qtest_init_with_env(qemu_var, "-machine none");
response = qtest_qmp(qts, "{ 'execute': 'query-machines' }");
g_assert(response);
@@ -1539,6 +1544,8 @@ static struct MachInfo *qtest_get_machines(const char *var)
qtest_quit(qts);
qobject_unref(response);
+ silence_spawn_log = false;
+
memset(&machines[idx], 0, sizeof(struct MachInfo)); /* Terminating entry */
return machines;
}