summaryrefslogtreecommitdiff
path: root/tests/testglib.c
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-01-11 15:59:14 +0100
committerRodrigo Moya <rodrigo@gnome-db.org>2011-01-11 15:59:14 +0100
commitd75842ff4c8c9d78dbd5462409ab2c93600fa9a6 (patch)
tree86def8b54a1cb6db27a3bff6c6e6caada203ad13 /tests/testglib.c
parent65bd1f526d86ce08d6fa4d7d6fc1140198c9aef1 (diff)
parentfabf506b8d5baf8f59fca563e6f1a62be5148112 (diff)
downloadglib-wip/gsettings-list.tar.gz
Merge branch 'master' into wip/gsettings-listwip/gsettings-list
Diffstat (limited to 'tests/testglib.c')
-rw-r--r--tests/testglib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/testglib.c b/tests/testglib.c
index b4e29f07b..158808a4b 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -1038,6 +1038,7 @@ hash_table_tests (void)
g_hash_table_destroy (hash_table);
}
+#ifndef G_DISABLE_DEPRECATED
static void
relation_test (void)
{
@@ -1110,6 +1111,7 @@ relation_test (void)
relation = NULL;
}
+#endif
static void
gstring_tests (void)
@@ -1539,7 +1541,9 @@ main (int argc,
g_test_add_func ("/testglib/GTree", binary_tree_test);
g_test_add_func ("/testglib/Arrays", test_arrays);
g_test_add_func ("/testglib/GHashTable", hash_table_tests);
- g_test_add_func ("/testglib/Relation", relation_test);
+#ifndef G_DISABLE_DEPRECATED
+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
+#endif
g_test_add_func ("/testglib/File Paths", test_paths);
g_test_add_func ("/testglib/File Functions", test_file_functions);
g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);