From patchwork Mon Jan 9 15:56:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 135059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE4BAB6FA5 for ; Tue, 10 Jan 2012 02:57:48 +1100 (EST) Received: from localhost ([::1]:55164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHbW-0005RR-7f for incoming@patchwork.ozlabs.org; Mon, 09 Jan 2012 10:57:46 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHbE-0005N8-1h for qemu-devel@nongnu.org; Mon, 09 Jan 2012 10:57:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkHb3-00019b-AY for qemu-devel@nongnu.org; Mon, 09 Jan 2012 10:57:28 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:59103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHb2-00018x-T4 for qemu-devel@nongnu.org; Mon, 09 Jan 2012 10:57:16 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Jan 2012 10:57:15 -0500 Received: from d01relay07.pok.ibm.com (9.56.227.147) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 9 Jan 2012 10:56:48 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q09FuX3p3600526 for ; Mon, 9 Jan 2012 10:56:33 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q09FuWQ2009135 for ; Mon, 9 Jan 2012 13:56:32 -0200 Received: from titi.austin.rr.com (sig-9-65-217-92.mts.ibm.com [9.65.217.92]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q09FuDUl007421; Mon, 9 Jan 2012 13:56:29 -0200 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 9 Jan 2012 09:56:07 -0600 Message-Id: <1326124572-8312-6-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1326124572-8312-1-git-send-email-aliguori@us.ibm.com> References: <1326124572-8312-1-git-send-email-aliguori@us.ibm.com> x-cbid: 12010915-5806-0000-0000-00001135C722 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.137 Cc: Anthony Liguori , Luiz Capitulino Subject: [Qemu-devel] [PATCH 06/11] check-qstring: convert to gtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori --- check-qstring.c | 75 +++++++++++++++++------------------------------------- configure | 4 +- 2 files changed, 26 insertions(+), 53 deletions(-) diff --git a/check-qstring.c b/check-qstring.c index 93bd475..681bb68 100644 --- a/check-qstring.c +++ b/check-qstring.c @@ -20,31 +20,29 @@ * (with some violations to access 'private' data) */ -START_TEST(qstring_from_str_test) +static void qstring_from_str_test(void) { QString *qstring; const char *str = "QEMU"; qstring = qstring_from_str(str); - fail_unless(qstring != NULL); - fail_unless(qstring->base.refcnt == 1); - fail_unless(strcmp(str, qstring->string) == 0); - fail_unless(qobject_type(QOBJECT(qstring)) == QTYPE_QSTRING); + g_assert(qstring != NULL); + g_assert(qstring->base.refcnt == 1); + g_assert(strcmp(str, qstring->string) == 0); + g_assert(qobject_type(QOBJECT(qstring)) == QTYPE_QSTRING); // destroy doesn't exit yet g_free(qstring->string); g_free(qstring); } -END_TEST -START_TEST(qstring_destroy_test) +static void qstring_destroy_test(void) { QString *qstring = qstring_from_str("destroy test"); QDECREF(qstring); } -END_TEST -START_TEST(qstring_get_str_test) +static void qstring_get_str_test(void) { QString *qstring; const char *ret_str; @@ -52,13 +50,12 @@ START_TEST(qstring_get_str_test) qstring = qstring_from_str(str); ret_str = qstring_get_str(qstring); - fail_unless(strcmp(ret_str, str) == 0); + g_assert(strcmp(ret_str, str) == 0); QDECREF(qstring); } -END_TEST -START_TEST(qstring_append_chr_test) +static void qstring_append_chr_test(void) { int i; QString *qstring; @@ -69,66 +66,42 @@ START_TEST(qstring_append_chr_test) for (i = 0; str[i]; i++) qstring_append_chr(qstring, str[i]); - fail_unless(strcmp(str, qstring_get_str(qstring)) == 0); + g_assert(strcmp(str, qstring_get_str(qstring)) == 0); QDECREF(qstring); } -END_TEST -START_TEST(qstring_from_substr_test) +static void qstring_from_substr_test(void) { QString *qs; qs = qstring_from_substr("virtualization", 3, 9); - fail_unless(qs != NULL); - fail_unless(strcmp(qstring_get_str(qs), "tualiza") == 0); + g_assert(qs != NULL); + g_assert(strcmp(qstring_get_str(qs), "tualiza") == 0); QDECREF(qs); } -END_TEST -START_TEST(qobject_to_qstring_test) +static void qobject_to_qstring_test(void) { QString *qstring; qstring = qstring_from_str("foo"); - fail_unless(qobject_to_qstring(QOBJECT(qstring)) == qstring); + g_assert(qobject_to_qstring(QOBJECT(qstring)) == qstring); QDECREF(qstring); } -END_TEST -static Suite *qstring_suite(void) +int main(int argc, char **argv) { - Suite *s; - TCase *qstring_public_tcase; + g_test_init(&argc, &argv, NULL); - s = suite_create("QString test-suite"); + g_test_add_func("/public/from_str", qstring_from_str_test); + g_test_add_func("/public/destroy", qstring_destroy_test); + g_test_add_func("/public/get_str", qstring_get_str_test); + g_test_add_func("/public/append_chr", qstring_append_chr_test); + g_test_add_func("/public/from_substr", qstring_from_substr_test); + g_test_add_func("/public/to_qstring", qobject_to_qstring_test); - qstring_public_tcase = tcase_create("Public Interface"); - suite_add_tcase(s, qstring_public_tcase); - tcase_add_test(qstring_public_tcase, qstring_from_str_test); - tcase_add_test(qstring_public_tcase, qstring_destroy_test); - tcase_add_test(qstring_public_tcase, qstring_get_str_test); - tcase_add_test(qstring_public_tcase, qstring_append_chr_test); - tcase_add_test(qstring_public_tcase, qstring_from_substr_test); - tcase_add_test(qstring_public_tcase, qobject_to_qstring_test); - - return s; -} - -int main(void) -{ - int nf; - Suite *s; - SRunner *sr; - - s = qstring_suite(); - sr = srunner_create(s); - - srunner_run_all(sr, CK_NORMAL); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; + return g_test_run(); } diff --git a/configure b/configure index cea9cb6..18f06ba 100755 --- a/configure +++ b/configure @@ -2800,10 +2800,10 @@ if test "$softmmu" = yes ; then tools="qemu-ga\$(EXESUF) $tools" fi if [ "$check_utests" = "yes" ]; then - checks="check-qstring check-qlist" + checks="check-qlist" checks="check-qjson $checks" fi - test_progs="$checks check-qdict check-qfloat check-qint test-coroutine test-qmp-output-visitor test-qmp-input-visitor" + test_progs="$checks check-qdict check-qfloat check-qint check-qstring test-coroutine test-qmp-output-visitor test-qmp-input-visitor" fi fi