diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/glib/test-profile.c | 2 | ||||
| -rw-r--r-- | test/glib/test-thread-client.c | 2 | ||||
| -rw-r--r-- | test/glib/test-thread-server.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index ab04496e..84089517 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -89,7 +89,7 @@ all-local: for D in $(TESTDIRS); do \ test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ; \ done ; \ - if test $(srcdir) != . ; then \ + if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then \ FILES=`(cd $(srcdir) && $(FIND_TESTS))` ; \ for F in $$FILES; do \ SRC=$(srcdir)/$$F ; \ diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c index 6d9d8e7f..23547a1f 100644 --- a/test/glib/test-profile.c +++ b/test/glib/test-profile.c @@ -185,7 +185,7 @@ main (int argc, char *argv[]) int i; g_thread_init (NULL); - dbus_gthread_init (); + dbus_g_thread_init (); dbus_error_init (&error); server = dbus_server_listen ("unix:tmpdir="DBUS_TEST_SOCKET_DIR, diff --git a/test/glib/test-thread-client.c b/test/glib/test-thread-client.c index d51d4e6a..122c839a 100644 --- a/test/glib/test-thread-client.c +++ b/test/glib/test-thread-client.c @@ -66,7 +66,7 @@ main (int argc, char *argv[]) int i; g_thread_init (NULL); - dbus_gthread_init (); + dbus_g_thread_init (); if(argc < 2) { diff --git a/test/glib/test-thread-server.c b/test/glib/test-thread-server.c index 8898ca7f..dd560328 100644 --- a/test/glib/test-thread-server.c +++ b/test/glib/test-thread-server.c @@ -178,7 +178,7 @@ main (int argc, char *argv[]) DBusError error; g_thread_init (NULL); - dbus_gthread_init (); + dbus_g_thread_init (); if (argc < 2) { |