Patchwork [04/11] check-qfloat: convert to gtest

login
register
mail settings
Submitter Anthony Liguori
Date Jan. 9, 2012, 3:56 p.m.
Message ID <1326124572-8312-4-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/135072/
State New
Headers show

Comments

Anthony Liguori - Jan. 9, 2012, 3:56 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 check-qfloat.c |   47 ++++++++++++-----------------------------------
 configure      |    4 ++--
 2 files changed, 14 insertions(+), 37 deletions(-)

Patch

diff --git a/check-qfloat.c b/check-qfloat.c
index 3344057..cdc66ea 100644
--- a/check-qfloat.c
+++ b/check-qfloat.c
@@ -10,7 +10,7 @@ 
  * See the COPYING.LIB file in the top-level directory.
  *
  */
-#include <check.h>
+#include <glib.h>
 
 #include "qfloat.h"
 #include "qemu-common.h"
@@ -21,56 +21,33 @@ 
  * (with some violations to access 'private' data)
  */
 
-START_TEST(qfloat_from_double_test)
+static void qfloat_from_double_test(void)
 {
     QFloat *qf;
     const double value = -42.23423;
 
     qf = qfloat_from_double(value);
-    fail_unless(qf != NULL);
-    fail_unless(qf->value == value);
-    fail_unless(qf->base.refcnt == 1);
-    fail_unless(qobject_type(QOBJECT(qf)) == QTYPE_QFLOAT);
+    g_assert(qf != NULL);
+    g_assert(qf->value == value);
+    g_assert(qf->base.refcnt == 1);
+    g_assert(qobject_type(QOBJECT(qf)) == QTYPE_QFLOAT);
 
     // destroy doesn't exit yet
     g_free(qf);
 }
-END_TEST
 
-START_TEST(qfloat_destroy_test)
+static void qfloat_destroy_test(void)
 {
     QFloat *qf = qfloat_from_double(0.0);
     QDECREF(qf);
 }
-END_TEST
 
-static Suite *qfloat_suite(void)
+int main(int argc, char **argv)
 {
-    Suite *s;
-    TCase *qfloat_public_tcase;
+    g_test_init(&argc, &argv, NULL);
 
-    s = suite_create("QFloat test-suite");
+    g_test_add_func("/public/from_double", qfloat_from_double_test);
+    g_test_add_func("/public/destroy", qfloat_destroy_test);
 
-    qfloat_public_tcase = tcase_create("Public Interface");
-    suite_add_tcase(s, qfloat_public_tcase);
-    tcase_add_test(qfloat_public_tcase, qfloat_from_double_test);
-    tcase_add_test(qfloat_public_tcase, qfloat_destroy_test);
-
-    return s;
-}
-
-int main(void)
-{
-    int nf;
-    Suite *s;
-    SRunner *sr;
-
-    s = qfloat_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 7e3f28f..a7a6758 100755
--- a/configure
+++ b/configure
@@ -2801,9 +2801,9 @@  if test "$softmmu" = yes ; then
     fi
     if [ "$check_utests" = "yes" ]; then
       checks="check-qint check-qstring check-qlist"
-      checks="check-qfloat check-qjson $checks"
+      checks="check-qjson $checks"
     fi
-    test_progs="$checks check-qdict test-coroutine test-qmp-output-visitor test-qmp-input-visitor"
+    test_progs="$checks check-qdict check-qfloat test-coroutine test-qmp-output-visitor test-qmp-input-visitor"
   fi
 fi