build: Build GVDB as a Meson subproject

Since recently, GVDB repository includes a minimal meson.build
file to allow building as a subproject without additional
hassles (e.g. shipping supporting files at /subprojects/repofiles/)
Drop our internal copy of GVDB in favor of a subproject built
through Meson.

Since we're updating many years across, there has been GVDB API
updates that we need to adapt to: GvdbTable is no longer a refcounted
object, and gvdb_table_walk() is no longer offered to iterate across
values.

These largely affect our own set of GVDB tests though, the test
for gvdb_table_walk() was dropped, and so is the ref/unref one
(it basically does the same than gvdb/flat_strings, after dropping
the refcounting). These remaining tests stay useful, and should
ideally move into the GVDB repository, so it can run as a separate
suite here.

2 files changed, 4 insertions, 108 deletions

diff --git a/tests/gvdb/gvdb-test.c b/tests/gvdb/gvdb-test.c
index ad91c7c6d..d32cc1dc1 100644
--- a/tests/gvdb/gvdb-test.c
+++ b/tests/gvdb/gvdb-test.c
@@ -14,72 +14,6 @@ remove_file (const gchar *filename)
 }
 
 static void
-walk_value_cb (G_GNUC_UNUSED const gchar *name,
-               G_GNUC_UNUSED gsize name_len,
-               G_GNUC_UNUSED GVariant *value,
-               gpointer user_data)
-{
-        gint *counter = (gint *)user_data;
-        (*counter) += 1;
-}
-
-static gboolean
-walk_open_cb (G_GNUC_UNUSED const gchar *name,
-              G_GNUC_UNUSED gsize name_len,
-              G_GNUC_UNUSED gpointer user_data)
-{
-        return TRUE;
-}
-
-static void
-walk_close_cb (G_GNUC_UNUSED gsize name_len,
-               G_GNUC_UNUSED gpointer user_data)
-{
-}
-
-static void
-test_gvdb_walk (void)
-{
-        GHashTable *root_table, *ns_table;
-        GvdbItem   *root, *item;
-        GvdbTable  *root_level, *ns_level;
-        guint32     item_id;
-        gchar      *key;
-        gint        counter = 0;
-
-        const gchar *DB_FILE = "./test_walk.gvdb";
-
-        root_table = gvdb_hash_table_new (NULL, NULL);
-
-        ns_table = gvdb_hash_table_new (root_table, "namespaces");
-        root = gvdb_hash_table_insert (ns_table, "");
-        for (item_id = 0; item_id < 3; item_id++) {
-                key = g_strdup_printf ("ns%d", item_id);
-                item = gvdb_hash_table_insert (ns_table, key);
-                gvdb_item_set_parent (item, root);
-                gvdb_item_set_value (item, g_variant_new_string ("http://some.cool.ns"));
-                g_free (key);
-        }
-
-        g_assert_true (gvdb_table_write_contents (root_table, DB_FILE, FALSE, NULL));
-
-        g_hash_table_unref (ns_table);
-        g_hash_table_unref (root_table);
-
-
-        root_level = gvdb_table_new (DB_FILE, TRUE, NULL);
-        ns_level = gvdb_table_get_table (root_level, "namespaces");
-
-        gvdb_table_walk (ns_level, "", walk_open_cb, walk_value_cb, walk_close_cb, &counter);
-        g_assert_cmpint (counter, ==, 3);
-
-        gvdb_table_unref (root_level);
-        gvdb_table_unref (ns_level);
-
-        remove_file (DB_FILE);
-}
-
-static void
 test_gvdb_nested_keys (void)
 {
         GHashTable *root_table, *ns_table;
@@ -127,8 +61,8 @@ test_gvdb_nested_keys (void)
         }
         g_strfreev (keys);
         
-        gvdb_table_unref (root_level);
-        gvdb_table_unref (ns_level);
+        gvdb_table_free (root_level);
+        gvdb_table_free (ns_level);
         remove_file (DB_FILE);
 }
 
@@ -157,7 +91,7 @@ simple_test (const gchar *filename, gboolean use_byteswap)
         g_variant_unref (expected);
         g_variant_unref (value);
 
-        gvdb_table_unref (read);
+        gvdb_table_free (read);
 }
 
 static void
@@ -182,42 +116,6 @@ test_gvdb_flat_strings (void)
 }
 
 static void
-test_gvdb_ref_unref (void)
-{
-        GHashTable *table;
-        GvdbTable  *read, *read_ref;
-        GVariant   *value;
-        GVariant   *expected;
-
-        const gchar *DB_FILE = "./test_ref_unref.gvdb";
-
-        /* Create a table */
-        table = gvdb_hash_table_new (NULL, "level1");
-        gvdb_hash_table_insert_string (table, "key1", "whatever");
-        g_assert_true (gvdb_table_write_contents (table, DB_FILE, FALSE, NULL));
-        g_hash_table_unref (table);
-
-        /* Read the table */
-        read = gvdb_table_new (DB_FILE, TRUE, NULL);
-        g_assert_true (read && gvdb_table_is_valid (read));
-
-        /* Run the checks with a reference */
-        read_ref = gvdb_table_ref (read);
-        g_assert_true (gvdb_table_has_value (read_ref, "key1"));
-        value = gvdb_table_get_value (read_ref, "key1");
-        expected = g_variant_new_string ("whatever");
-        g_assert_true (g_variant_equal (value, expected));
-
-        g_variant_unref (expected);
-        g_variant_unref (value);
-
-        gvdb_table_unref (read);
-        gvdb_table_unref (read_ref);
-
-        remove_file (DB_FILE);
-}
-
-static void
 test_gvdb_corrupted_file (void)
 {
         GError *error = NULL;
@@ -239,10 +137,8 @@ main (gint argc, gchar **argv)
 {
         g_test_init (&argc, &argv, NULL);
 
-        g_test_add_func ("/gvdb/ref_unref", test_gvdb_ref_unref);
         g_test_add_func ("/gvdb/flat_strings", test_gvdb_flat_strings);
         g_test_add_func ("/gvdb/nested_keys", test_gvdb_nested_keys);
-        g_test_add_func ("/gvdb/walk", test_gvdb_walk);
         g_test_add_func ("/gvdb/byteswapped", test_gvdb_byteswapped);
         g_test_add_func ("/gvdb/corrupted_file", test_gvdb_corrupted_file);
 
diff --git a/tests/gvdb/meson.build b/tests/gvdb/meson.build
index 558f0f4e2..5cdf4ac9a 100644
--- a/tests/gvdb/meson.build
+++ b/tests/gvdb/meson.build
@@ -1,6 +1,6 @@
 gvdb_test = executable('gvdb-test',
     'gvdb-test.c',
-    dependencies: gvdb_dep,
+    dependencies: [gio, gvdb_dep],
     include_directories: configinc,
 )