aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@suse.de>2023-10-18 16:27:33 -0300
committerJuan Quintela <quintela@redhat.com>2023-10-20 08:51:41 +0200
commit1027fc0ae4fcd24c11a43d1f217a1d11579a574b (patch)
tree351a82acbe7cf70f3d4f3c5088367fc475cc872f /tests
parent41b2eba4e5c480b8515db60f23b0cb5eeae0dc50 (diff)
downloadqemu-1027fc0ae4fcd24c11a43d1f217a1d11579a574b.zip
qemu-1027fc0ae4fcd24c11a43d1f217a1d11579a574b.tar.gz
qemu-1027fc0ae4fcd24c11a43d1f217a1d11579a574b.tar.bz2
tests/qtest: Introduce qtest_has_machine_with_env
Add a variant of qtest_has_machine() that receives an environment variable containing an alternate QEMU binary path. Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Juan Quintela <quintela@redhat.com> Message-ID: <20231018192741.25885-5-farosas@suse.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/qtest/libqtest.c9
-rw-r--r--tests/qtest/libqtest.h9
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 3cc7bf3..603d900 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -1565,12 +1565,12 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
}
}
-bool qtest_has_machine(const char *machine)
+bool qtest_has_machine_with_env(const char *var, const char *machine)
{
struct MachInfo *machines;
int i;
- machines = qtest_get_machines(NULL);
+ machines = qtest_get_machines(var);
for (i = 0; machines[i].name != NULL; i++) {
if (g_str_equal(machine, machines[i].name) ||
@@ -1582,6 +1582,11 @@ bool qtest_has_machine(const char *machine)
return false;
}
+bool qtest_has_machine(const char *machine)
+{
+ return qtest_has_machine_with_env(NULL, machine);
+}
+
bool qtest_has_device(const char *device)
{
static QList *list;
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h
index 76fc195..d16deb9 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -931,6 +931,15 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
bool qtest_has_machine(const char *machine);
/**
+ * qtest_has_machine_with_env:
+ * @var: Environment variable from where to take the QEMU binary
+ * @machine: The machine to look for
+ *
+ * Returns: true if the machine is available in the specified binary.
+ */
+bool qtest_has_machine_with_env(const char *var, const char *machine);
+
+/**
* qtest_has_device:
* @device: The device to look for
*