[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 33/37] tests: add qtest_add_data_func_full
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 33/37] tests: add qtest_add_data_func_full |
Date: |
Thu, 28 Jul 2016 18:38:04 +0400 |
From: Marc-André Lureau <address@hidden>
Allows to specify a destroy function for the test data.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/libqtest.c | 15 ++++++++++++++-
tests/libqtest.h | 7 ++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index eb00f13..6ec56a6 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -758,8 +758,21 @@ 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)
+{
+#if GLIB_CHECK_VERSION(2, 34, 0)
+ gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str);
+ g_test_add_data_func_full(path, data, fn, data_free_func);
+ g_free(path);
+#else
+ qtest_add_data_func(str, data, fn);
+#endif
+}
+
void qtest_add_data_func(const char *str, const void *data,
- void (*fn)(const void *))
+ void (*fn)(const void *))
{
gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str);
g_test_add_data_func(path, data, fn);
diff --git a/tests/libqtest.h b/tests/libqtest.h
index 37f37ad..e4c9c39 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -413,15 +413,20 @@ const char *qtest_get_arch(void);
void qtest_add_func(const char *str, void (*fn)(void));
/**
- * qtest_add_data_func:
+ * 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().
*/
+void qtest_add_data_func_full(const char *str, void *data,
+ void (*fn)(const void *),
+ GDestroyNotify data_free_func);
+
void qtest_add_data_func(const char *str, const void *data,
void (*fn)(const void *));
--
2.9.0
- [Qemu-devel] [PATCH v2 24/37] ahci: free irqs array, (continued)
- [Qemu-devel] [PATCH v2 24/37] ahci: free irqs array, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 25/37] sd: free timer, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 26/37] qjson: free str, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 27/37] virtio-input: free config list, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 28/37] ipmi: free extern timer, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 29/37] usb: free USBDevice.strings, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 30/37] tests: free a bunch of qmp responses, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 31/37] usb: free leaking path, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 32/37] bus: simplify name handling, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 33/37] tests: add qtest_add_data_func_full,
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 34/37] tests: pc-cpu-test leaks fixes, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 35/37] tests: fix rsp leak in postcopy-test, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 37/37] tests: fix postcopy-test leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 36/37] ahci: fix sglist leak on retry, marcandre . lureau, 2016/07/28
- Re: [Qemu-devel] [PATCH v2 00/37] Various memory leak fixes, Eric Blake, 2016/07/28