From patchwork Thu Jul 28 14:38:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9251373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88CEF607D8 for ; Thu, 28 Jul 2016 15:09:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79FA027D16 for ; Thu, 28 Jul 2016 15:09:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E76727D4A; Thu, 28 Jul 2016 15:09:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0F5C727D16 for ; Thu, 28 Jul 2016 15:09:51 +0000 (UTC) Received: from localhost ([::1]:53837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmwY-00049y-4V for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jul 2016 11:09:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmU7-0001K8-6F for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSmU3-0001BZ-0o for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmU2-0001BV-RX for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:22 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6EB137F74B for ; Thu, 28 Jul 2016 14:40:22 +0000 (UTC) Received: from localhost (ovpn-116-92.phx2.redhat.com [10.3.116.92]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6SEeI2f031040; Thu, 28 Jul 2016 10:40:21 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 28 Jul 2016 18:38:04 +0400 Message-Id: <20160728143808.13707-34-marcandre.lureau@redhat.com> In-Reply-To: <20160728143808.13707-1-marcandre.lureau@redhat.com> References: <20160728143808.13707-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 28 Jul 2016 14:40:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 33/37] tests: add qtest_add_data_func_full X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Allows to specify a destroy function for the test data. Signed-off-by: Marc-André Lureau --- 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 *));