Merge branch 'wip/nielsdg/remove-useless-macros' into 'master'

Remove useless macro to check GLib version

See merge request GNOME/libsecret!12
This commit is contained in:
Niels De Graef 2019-01-19 12:40:51 +00:00
commit 92e9952ba2
11 changed files with 0 additions and 35 deletions

View File

@ -193,9 +193,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-attributes");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add_func ("/attributes/build", test_build);
g_test_add_func ("/attributes/build-unknown", test_build_unknown);

View File

@ -997,9 +997,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-collection");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/collection/new-sync", Test, "mock-service-normal.py", setup, test_new_sync, teardown);
g_test_add ("/collection/new-async", Test, "mock-service-normal.py", setup, test_new_async, teardown);

View File

@ -859,9 +859,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-item");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/item/new-sync", Test, "mock-service-normal.py", setup, test_new_sync, teardown);
g_test_add ("/item/new-async", Test, "mock-service-normal.py", setup, test_new_async, teardown);

View File

@ -949,9 +949,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-service");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/service/search-sync", Test, "mock-service-normal.py", setup, test_search_sync, teardown);
g_test_add ("/service/search-async", Test, "mock-service-normal.py", setup, test_search_async, teardown);

View File

@ -365,9 +365,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-password");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/password/lookup-sync", Test, "mock-service-normal.py", setup, test_lookup_sync, teardown);
g_test_add ("/password/lookup-async", Test, "mock-service-normal.py", setup, test_lookup_async, teardown);

View File

@ -723,9 +723,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-service");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/service/search-for-paths", Test, "mock-service-normal.py", setup, test_search_paths_sync, teardown);
g_test_add ("/service/search-for-paths-async", Test, "mock-service-normal.py", setup, test_search_paths_async, teardown);

View File

@ -404,9 +404,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-prompt");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
/* Suppress these messages in tests */
g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG,

View File

@ -600,9 +600,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-service");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/service/get-sync", Test, "mock-service-normal.py", setup_mock, test_get_sync, teardown_mock);
g_test_add ("/service/get-async", Test, "mock-service-normal.py", setup_mock, test_get_async, teardown_mock);

View File

@ -219,9 +219,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-session");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add ("/session/ensure-aes", Test, "mock-service-normal.py", setup, test_ensure, teardown);
g_test_add ("/session/ensure-twice", Test, "mock-service-normal.py", setup, test_ensure_twice, teardown);

View File

@ -216,10 +216,6 @@ main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
g_set_prgname ("test-value");
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
g_test_add_func ("/value/new", test_new);
g_test_add_func ("/value/new-terminated", test_new_terminated);
g_test_add_func ("/value/new-full", test_new_full);

View File

@ -491,10 +491,6 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
#endif
#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
#endif
if (argc < 2)
usage();