increased test time out

diff --git a/test/daemon/daemon-test.c b/test/daemon/daemon-test.c
index a952642..8e7d2ac 100644 (file)
--- a/test/daemon/daemon-test.c
+++ b/test/daemon/daemon-test.c
@@ -199,7 +199,7 @@ _setup_daemon (void)
     gsize len = 0;
     const gchar *dbus_monitor = NULL;
 
-    argv[1] = g_strdup_printf ("--config-file=%s/%s", GUM_TEST_DATA_DIR,
+    argv[1] = g_strdup_printf ("--config-file=%s%s", GUM_TEST_DATA_DIR,
             "test-gumd-dbus.conf");
 
     if (pipe(pipe_fd)== -1) {
@@ -1915,7 +1915,7 @@ Suite* daemon_suite (void)
     Suite *s = suite_create ("Gum daemon");
     
     tc = tcase_create ("Daemon tests");
-    tcase_set_timeout(tc, 10);
+    tcase_set_timeout(tc, 15);
     tcase_add_unchecked_fixture (tc, _setup_daemon, _teardown_daemon);
     tcase_add_checked_fixture (tc, _create_mainloop, _stop_mainloop);
 

diff --git a/test/data/test-gumd-dbus.conf.in b/test/data/test-gumd-dbus.conf.in
index 41bc9e6..4fc918e 100644 (file)
--- a/test/data/test-gumd-dbus.conf.in
+++ b/test/data/test-gumd-dbus.conf.in
@@ -2,7 +2,6 @@
     <type>@MESSAGE_BUS_TYPE@</type>
     <listen>unix:tmpdir=/tmp/</listen>
     <servicedir>@abs_top_builddir@/test/data/services</servicedir>
-    <servicedir>@DBUS_SERVICES_DIR@</servicedir>
     <policy context="default">
         <!-- Allow everything to be sent -->
         <allow send_destination="*" eavesdrop="true"/>

diff --git a/test/lib/client-test.c b/test/lib/client-test.c
index 1e36247..888f0c1 100644 (file)
--- a/test/lib/client-test.c
+++ b/test/lib/client-test.c
@@ -205,7 +205,7 @@ _setup_daemon (void)
     gsize len = 0;
     const gchar *dbus_monitor = NULL;
 
-    argv[1] = g_strdup_printf ("--config-file=%s/%s", GUM_TEST_DATA_DIR,
+    argv[1] = g_strdup_printf ("--config-file=%s%s", GUM_TEST_DATA_DIR,
             "test-gumd-dbus.conf");
 
     if (pipe(pipe_fd)== -1) {
@@ -814,7 +814,7 @@ Suite* daemon_suite (void)
     Suite *s = suite_create ("Gum client");
     
     tc = tcase_create ("Client tests");
-    tcase_set_timeout(tc, 10);
+    tcase_set_timeout(tc, 15);
     tcase_add_unchecked_fixture (tc, _setup_daemon, _teardown_daemon);
     tcase_add_checked_fixture (tc, _create_mainloop, _stop_mainloop);