Move test-entity to dbus enabled test and cleanup

As tpl-entity uses dbus, move it to dbus enabled test so it runs in sep
dbus session. Also cleanup makefiles and headers so it all compiles well.

5 files changed, 34 insertions, 39 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d5c4cb4..3c7f30f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,12 +4,7 @@ endif
 
 SUBDIRS = $(CHECKTWISTED) suppressions lib dbus
 
-LDADD = \
-	$(top_builddir)/telepathy-logger/libtelepathy-logger.la \
-	$(TPL_LIBS)
-
-TEST_EXECUTABLES = \
-	test-entity			\
+noinst_PROGRAMS = \
 	test-tpl-channel		\
 	test-tpl-conf			\
 	test-tpl-log-store-sqlite	\
@@ -17,9 +12,11 @@ TEST_EXECUTABLES = \
 	test-tpl-observer		\
 	$(NULL)
 
-noinst_PROGRAMS = \
-	${TEST_EXECUTABLES}	\
-	$(NULL)
+TESTS = $(noinst_PROGRAMS)
+
+LDADD = \
+	$(top_builddir)/telepathy-logger/libtelepathy-logger.la \
+	$(TPL_LIBS)
 
 test_tpl_channel_SOURCES = \
 	test-tpl-channel.c	\
@@ -32,15 +29,6 @@ test_tpl_observer_SOURCES = \
 	tpl-channel-test.c	\
 	$(NULL)
 
-test_searches_SOURCES = \
-	test-searches.c \
-	constants.h	\
-	$(NULL)
-
-test_entity_LDADD = \
-	$(top_builddir)/tests/lib/libtp-logger-tests.la \
-	$(LDADD) \
-	$(NULL)
 
 AM_CFLAGS = \
 	$(ERROR_CFLAGS) \
@@ -49,8 +37,6 @@ AM_CFLAGS = \
 	-I$(top_builddir) \
 	$(NULL)
 
-TESTS = $(TEST_EXECUTABLES)
-
 TESTS_ENVIRONMENT = \
 	G_DEBUG=fatal-warnings,fatal-criticals		\
 	TPL_TEST_MODE=true 				\
@@ -75,7 +61,6 @@ check-valgrind: $(TESTS)
 check_c_sources = \
 	$(dbus_test_sources)	\
 	tpl-channel-test.c	\
-	test-entity.c		\
 	test-tpl-channel.c	\
 	test-tpl-conf.c		\
 	test-tpl-observer.c	\
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 57ddb21..12111da 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -1,7 +1,8 @@
 noinst_PROGRAMS = \
-    test-searches 		\
-    test-tpl-log-store-pidgin 	\
-    $(NULL)
+	test-entity 			\
+	test-searches 			\
+	test-tpl-log-store-pidgin 	\
+	$(NULL)
 
 TESTS = $(noinst_PROGRAMS)
 
@@ -11,18 +12,27 @@ LDADD = \
 	$(TPL_LIBS) 						\
 	$(NULL)
 
+test_searches_SOURCES = \
+	test-searches.c \
+	constants.h	\
+	$(NULL)
+
+test_entity_LDADD = \
+	$(top_builddir)/tests/lib/libtp-logger-tests.la \
+	$(LDADD) \
+	$(NULL)
 
 check_c_sources = *.c
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-AM_CPPFLAGS = \
-    -I${top_srcdir} -I${top_builddir}	\
-    -D_TP_IGNORE_DEPRECATIONS		\
-    $(TPL_CFLAGS)			\
-    $(NULL)
-
-AM_CFLAGS = $(ERROR_CFLAGS)
+AM_CFLAGS = \
+	$(ERROR_CFLAGS) \
+	$(TPL_CFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/tests
+	$(NULL)
 
 TESTS_ENVIRONMENT = \
     abs_top_builddir=@abs_top_builddir@				\
diff --git a/tests/test-entity.c b/tests/dbus/test-entity.c
index 5877a5d..5877a5d 100644
--- a/tests/test-entity.c
+++ b/tests/dbus/test-entity.c
diff --git a/tests/dbus/test-searches.c b/tests/dbus/test-searches.c
index eac2c94..6193e5f 100644
--- a/tests/dbus/test-searches.c
+++ b/tests/dbus/test-searches.c
@@ -1,8 +1,8 @@
-#include "../../telepathy-logger/log-manager.c"
+#include "telepathy-logger/log-manager.c"
 
-#include "../lib/util.h"
-#include "../lib/simple-account.h"
-#include "../lib/simple-account-manager.h"
+#include "lib/util.h"
+#include "lib/simple-account.h"
+#include "lib/simple-account-manager.h"
 
 #include <telepathy-logger/debug-internal.h>
 #include <telepathy-logger/log-manager-internal.h>
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 87a30b0..054d841 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -1,11 +1,11 @@
 /* FIXME: hugly kludge: we need to include all the declarations which are used
  * by the GInterface and thus not in the -internal.h */
-#include "../../telepathy-logger/log-store-pidgin.c"
+#include "telepathy-logger/log-store-pidgin.c"
 
 
-#include "../lib/util.h"
-#include "../lib/simple-account.h"
-#include "../lib/simple-account-manager.h"
+#include "lib/util.h"
+#include "lib/simple-account.h"
+#include "lib/simple-account-manager.h"
 
 #include <telepathy-logger/log-store-pidgin-internal.h>
 #include <telepathy-logger/event-text-internal.h>