[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full |
Date: |
Thu, 8 Sep 2016 18:17:17 +0400 |
Allows one to specify a destroy function for the test data.
Add a fallback using glib g_test_add_vtable() internal function, whose
signature changed over time. Tested with glib 2.22, 2.26 and 2.48, which
according to git log should be enough to cover all variations.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/libqtest.c | 19 +++++++++++++++++++
tests/libqtest.h | 17 +++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index eb00f13..42ccb62 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -758,6 +758,25 @@ void qtest_add_func(const char *str, void (*fn)(void))
g_free(path);
}
+void qtest_add_data_func_full(const char *str, void *data,
+ void (*fn)(const void *),
+ GDestroyNotify data_free_func)
+{
+ gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str);
+#if GLIB_CHECK_VERSION(2, 34, 0)
+ g_test_add_data_func_full(path, data, fn, data_free_func);
+#elif GLIB_CHECK_VERSION(2, 26, 0)
+ /* back-compat casts, remove this once we can require new-enough glib */
+ g_test_add_vtable(path, 0, data, NULL,
+ (GTestFixtureFunc)fn, (GTestFixtureFunc) data_free_func);
+#else
+ /* back-compat casts, remove this once we can require new-enough glib */
+ g_test_add_vtable(path, 0, data, NULL,
+ (void (*)(void)) fn, (void (*)(void)) data_free_func);
+#endif
+ g_free(path);
+}
+
void qtest_add_data_func(const char *str, const void *data,
void (*fn)(const void *))
{
diff --git a/tests/libqtest.h b/tests/libqtest.h
index 37f37ad..d2b4853 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -425,6 +425,23 @@ void qtest_add_func(const char *str, void (*fn)(void));
void qtest_add_data_func(const char *str, const void *data,
void (*fn)(const void *));
+/**
+ * qtest_add_data_func_full:
+ * @str: Test case path.
+ * @data: Test case data
+ * @fn: Test case function
+ * @data_free_func: GDestroyNotify for data
+ *
+ * Add a GTester testcase with the given name, data and function.
+ * The path is prefixed with the architecture under test, as
+ * returned by qtest_get_arch().
+ *
+ * @data is passed to @data_free_func() on test completion.
+ */
+void qtest_add_data_func_full(const char *str, void *data,
+ void (*fn)(const void *),
+ GDestroyNotify data_free_func);
+
/**
* qtest_add:
* @testpath: Test case path
--
2.10.0
- [Qemu-devel] [PULLv2 11/25] portio: keep references on portio, (continued)
- [Qemu-devel] [PULLv2 11/25] portio: keep references on portio, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 14/25] machine: use class base init generated name, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 16/25] tests: fix qom-test leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 15/25] acpi-build: fix array leak, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 17/25] pc: free i8259, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 18/25] pc: keep gsi reference, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 20/25] ipmi: free extern timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 19/25] sd: free timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full,
Marc-André Lureau <=
- [Qemu-devel] [PULLv2 23/25] tests: pc-cpu-test leaks fixes, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 21/25] bus: simplify name handling, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 24/25] tests: fix rsp leak in postcopy-test, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 25/25] tests: fix postcopy-test leaks, Marc-André Lureau, 2016/09/08
- Re: [Qemu-devel] [PULLv2 00/25] Leak patches, Peter Maydell, 2016/09/09