AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'no-more-testdbus' into 'master'

Browse Source 
Stop using GTestDBus

See merge request GNOME/gtk!2104
This commit is contained in:
Emmanuele Bassi 2020-06-17 16:54:06 +00:00
commit 981c71c497
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
testsuite/gtk/defaultvalue.c
View File

@ -469,9 +469,6 @@ main (int argc, char **argv)
{
const GType *otypes;
guint i;
GTestDBus *bus;
GMainLoop *loop;
gint result;
const char *display, *x_r_d;
/* These must be set before gtk_test_init */
@ -483,12 +480,6 @@ main (int argc, char **argv)
display = g_getenv ("DISPLAY");
x_r_d = g_getenv ("XDG_RUNTIME_DIR");
/* Create one test bus for all tests, as we have a lot of very small
* and quick tests.
*/
bus = g_test_dbus_new (G_TEST_DBUS_NONE);
g_test_dbus_up (bus);
if (display)
g_setenv ("DISPLAY", display, TRUE);
if (x_r_d)
@ -515,18 +506,5 @@ main (int argc, char **argv)
g_free (testname);
}
result = g_test_run();
/* Work around the annoying issue that g_test_dbus_down is giving
* us an "Error while sending AddMatch" that comes out of an idle
*/
loop = g_main_loop_new (NULL, FALSE);
g_timeout_add (1000, (GSourceFunc)g_main_loop_quit, loop);
g_main_loop_run (loop);
g_main_loop_unref (loop);
g_test_dbus_down (bus);
g_object_unref (bus);
return result;
return g_test_run();
}

10
testsuite/gtk/objects-finalize.c
View File

@ -130,7 +130,6 @@ main (int argc, char **argv)
{
const GType *all_types;
guint n_types = 0, i;
GTestDBus *bus;
gint result;
const char *display, *x_r_d;
@ -142,12 +141,6 @@ main (int argc, char **argv)
display = g_getenv ("DISPLAY");
x_r_d = g_getenv ("XDG_RUNTIME_DIR");
/* Create one test bus for all tests, as we have a lot of very small
* and quick tests.
*/
bus = g_test_dbus_new (G_TEST_DBUS_NONE);
g_test_dbus_up (bus);
if (display)
g_setenv ("DISPLAY", display, TRUE);
if (x_r_d)
@ -189,8 +182,5 @@ main (int argc, char **argv)
result = g_test_run();
g_test_dbus_down (bus);
g_object_unref (bus);
return result;
}