functional-tests: Moved all IPC tests to ipc/

Also renamed to prefix with test- instead of suffix like other tests

12 files changed, 191 insertions, 187 deletions

diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index a3a7b0d7e..bfb15731c 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = 				\
+	ipc				\
 	common				\
 	test-configurations 		\
 	test-extraction-data 		\
@@ -9,15 +10,6 @@ SUBDIRS = 				\
 	unittest2			\
 	test-ontologies
 
-INCLUDES =				\
-	$(BUILD_CFLAGS)			\
-	-I$(top_srcdir)/src		\
-	-I$(top_builddir)/src		\
-	$(DBUS_CFLAGS)			\
-	$(GLIB2_CFLAGS)			\
-	$(GIO_CFLAGS)			\
-	$(GTHREAD_CFLAGS)
-
 configdir = $(datadir)/tracker-tests
 
 config_SCRIPTS =			\
@@ -85,160 +77,6 @@ tracker-tests.aegis:
 ttl/gen-test-data.stamp:
 	cd ttl && $(MAKE) $(AM_MAKEFLAGS)
 
-noinst_PROGRAMS = busy-handling-test 	\
-	direct-query-test 		\
-	bus-query-test 			\
-	default-update-test 		\
-	bus-update-test 		\
-	class-signal-test 		\
-	class-signal-performance-test 	\
-	update-array-performance-test
-
-busy_handling_test_VALASOURCES = busy-handling-test.vala
-
-busy_handling_test_SOURCES = 		\
-	busy-handling-test.vala.stamp 	\
-	$(busy_handling_test_VALASOURCES:.vala=.c)
-
-busy-handling-test.vala.stamp: $(busy_handling_test_VALASOURCES)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
-	$(AM_V_GEN)touch $@
-
-busy_handling_test_LDADD = 		\
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS) 			\
-	$(GLIB2_LIBS) 			\
-	$(DBUS_LIBS)
-
-direct_query_test_VALASOURCES = shared-query-test.vala direct-query-test.vala
-
-direct_query_test_SOURCES = 		\
-	direct-query-test.vala.stamp 	\
-	$(direct_query_test_VALASOURCES:.vala=.c)
-
-default_update_test_VALASOURCES = shared-update-test.vala default-update-test.vala
-
-default_update_test_SOURCES = 		\
-	default-update-test.vala.stamp 	\
-	$(default_update_test_VALASOURCES:.vala=.c)
-
-bus_query_test_VALASOURCES = shared-query-test.vala bus-query-test.vala
-
-update_array_performance_test_SOURCES = update-array-performance-test.c
-
-bus_query_test_SOURCES = 		\
-	bus-query-test.vala.stamp 	\
-	$(bus_query_test_VALASOURCES:.vala=.c)
-
-bus_update_test_VALASOURCES = shared-update-test.vala bus-update-test.vala
-
-bus_update_test_SOURCES = 		\
-	bus-update-test.vala.stamp 	\
-	$(bus_update_test_VALASOURCES:.vala=.c)
-
-direct_vapi_sources = 			\
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
-	$(top_srcdir)/src/libtracker-direct/tracker-direct.vapi
-
-direct-query-test.vala.stamp: $(direct_query_test_VALASOURCES) $(direct_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
-	$(AM_V_GEN)touch $@
-
-direct_query_test_LDADD = 		\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS)			\
-	$(GLIB2_LIBS)
-
-default-update-test.vala.stamp: $(default_update_test_VALASOURCES) $(direct_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
-	$(AM_V_GEN)touch $@
-
-default_update_test_LDADD = $(direct_query_test_LDADD)
-
-bus_vapi_sources = \
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
-	$(top_srcdir)/src/libtracker-bus/tracker-bus.vapi
-
-bus-query-test.vala.stamp: $(bus_query_test_VALASOURCES) $(bus_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
-	$(AM_V_GEN)touch $@
-
-bus-update-test.vala.stamp: $(bus_update_test_VALASOURCES) $(bus_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
-	$(AM_V_GEN)touch $@
-
-bus_query_test_LDADD = 			\
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS) 			\
-	$(GLIB2_LIBS) 			\
-	$(DBUS_LIBS)
-
-bus_update_test_LDADD = $(bus_query_test_LDADD)
-
-class_signal_test_VALASOURCES = class-signal-test.vala
-
-class_signal_test_SOURCES = 		\
-	class-signal-test.vala.stamp 	\
-	$(class_signal_test_VALASOURCES:.vala=.c)
-
-class-signal-test.vala.stamp: $(class_signal_test_VALASOURCES) $(direct_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
-	$(AM_V_GEN)touch $@
-
-class_signal_test_LDADD = 		\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS) 			\
-	$(GLIB2_LIBS) 			\
-	$(DBUS_LIBS)
-
-class_signal_performance_test_VALASOURCES = class-signal-performance-test.vala
-
-class_signal_performance_test_SOURCES = \
-	class-signal-performance-test.vala.stamp \
-	$(class_signal_performance_test_VALASOURCES:.vala=.c)
-
-class-signal-performance-test.vala.stamp: $(class_signal_performance_test_VALASOURCES) $(direct_vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
-	$(AM_V_GEN)touch $@
-
-class_signal_performance_test_LDADD = \
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS) 			\
-	$(GLIB2_LIBS) 			\
-	$(DBUS_LIBS)
-
-update_array_performance_test_LDADD = 	\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)			\
-	$(GIO_LIBS) 			\
-	$(GLIB2_LIBS) 			\
-	$(DBUS_LIBS)
-
-BUILT_SOURCES = 			\
-	busy-handling-test.vala.stamp 	\
-	class-signal-test.vala.stamp 	\
-	class-signal-performance-test.vala.stamp \
-	direct-query-test.vala.stamp 	\
-	bus-query-test.vala.stamp 	\
-	default-update-test.vala.stamp 	\
-	bus-update-test.vala.stamp
-
 functional-test: ${standard_tests}
 	@if test -h /targets/links/scratchbox.config ; then \
 		export SBOX_REDIRECT_IGNORE=/usr/bin/python ; \
@@ -263,30 +101,11 @@ functional-test-slow: ${slow_tests}
 	  test ! -x $$test  || $$ENV_COMMAND_WRAPPER ./$$test > /dev/null; \
 	 done
 
-EXTRA_DIST = 					\
-	$(config_SCRIPTS) 			\
-	$(BUILT_SOURCES)			\
-	$(busy_handling_test_VALASOURCES)	\
-	$(class_signal_test_VALASOURCES)	\
-	$(class_signal_performance_test_VALASOURCES) \
-	$(direct_query_test_VALASOURCES)	\
-	$(default_update_test_VALASOURCES)	\
-	$(bus_query_test_VALASOURCES)		\
-	$(bus_update_test_VALASOURCES)
+EXTRA_DIST = 				\
+	$(config_SCRIPTS)
 
 if HAVE_MAEMO
-CLEANFILES = 					\
-	tests.xml				\
-	tracker-tests.aegis				
+CLEANFILES =				\
+	tests.xml			\
+	tracker-tests.aegis
 endif
-
-MAINTAINERCLEANFILES =					\
-	$(BUILT_SOURCES)				\
-	$(busy_handling_test_VALASOURCES:.vala=.c)	\
-	$(class_signal_test_VALASOURCES:.vala=.c)	\
-	$(class_signal_performance_test_VALASOURCES:.vala=.c) \
-	$(bus_query_test_VALASOURCES:.vala=.c)		\
-	$(bus_update_test_VALASOURCES:.vala=.c)		\
-	$(direct_query_test_VALASOURCES:.vala=.c)	\
-	$(default_update_test_VALASOURCES:.vala=.c)
-
diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am
new file mode 100644
index 000000000..c2fed718b
--- /dev/null
+++ b/tests/functional-tests/ipc/Makefile.am
@@ -0,0 +1,185 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES =						\
+	$(BUILD_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
+	$(DBUS_CFLAGS)					\
+	$(GLIB2_CFLAGS)					\
+	$(GIO_CFLAGS)					\
+	$(GTHREAD_CFLAGS)
+
+noinst_PROGRAMS =					\
+	test-busy-handling				\
+	test-direct-query				\
+	test-bus-query					\
+	test-default-update				\
+	test-bus-update				\
+	test-class-signal				\
+	test-class-signal-performance			\
+	test-update-array-performance
+
+test_busy_handling_VALASOURCES = test-busy-handling.vala
+
+test_busy_handling_SOURCES =				\
+	test-busy-handling.vala.stamp			\
+	$(test_busy_handling_VALASOURCES:.vala=.c)
+
+test-busy-handling.vala.stamp: $(test_busy_handling_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
+	$(AM_V_GEN)touch $@
+
+test_busy_handling_LDADD =				\
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)					\
+	$(DBUS_LIBS)
+
+test_direct_query_VALASOURCES = test-shared-query.vala test-direct-query.vala
+
+test_direct_query_SOURCES =				\
+	test-direct-query.vala.stamp			\
+	$(test_direct_query_VALASOURCES:.vala=.c)
+
+test_default_update_VALASOURCES = test-shared-update.vala test-default-update.vala
+
+test_default_update_SOURCES =				\
+	test-default-update.vala.stamp			\
+	$(test_default_update_VALASOURCES:.vala=.c)
+
+test_bus_query_VALASOURCES = test-shared-query.vala test-bus-query.vala
+
+test_update_array_performance_SOURCES = test-update-array-performance.c
+
+test_bus_query_SOURCES =				\
+	test-bus-query.vala.stamp			\
+	$(test_bus_query_VALASOURCES:.vala=.c)
+
+test_bus_update_VALASOURCES = test-shared-update.vala test-bus-update.vala
+
+test_bus_update_SOURCES =				\
+	test-bus-update.vala.stamp			\
+	$(test_bus_update_VALASOURCES:.vala=.c)
+
+direct_vapi_sources =					\
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	$(top_srcdir)/src/libtracker-direct/tracker-direct.vapi
+
+test-direct-query.vala.stamp: $(test_direct_query_VALASOURCES) $(direct_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
+	$(AM_V_GEN)touch $@
+
+test_direct_query_LDADD =				\
+	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)
+
+test-default-update.vala.stamp: $(test_default_update_VALASOURCES) $(direct_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
+	$(AM_V_GEN)touch $@
+
+test_default_update_LDADD = $(test_direct_query_LDADD)
+
+bus_vapi_sources = \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	$(top_srcdir)/src/libtracker-bus/tracker-bus.vapi
+
+test-bus-query.vala.stamp: $(test_bus_query_VALASOURCES) $(bus_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
+	$(AM_V_GEN)touch $@
+
+test-bus-update.vala.stamp: $(test_bus_update_VALASOURCES) $(bus_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
+	$(AM_V_GEN)touch $@
+
+test_bus_query_LDADD =					\
+	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)					\
+	$(DBUS_LIBS)
+
+test_bus_update_LDADD = $(test_bus_query_LDADD)
+
+test_class_signal_VALASOURCES = test-class-signal.vala
+
+test_class_signal_SOURCES =				\
+	test-class-signal.vala.stamp			\
+	$(test_class_signal_VALASOURCES:.vala=.c)
+
+test-class-signal.vala.stamp: $(test_class_signal_VALASOURCES) $(direct_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
+	$(AM_V_GEN)touch $@
+
+test_class_signal_LDADD =				\
+	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
+	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)					\
+	$(DBUS_LIBS)
+
+test_class_signal_performance_VALASOURCES = test-class-signal-performance.vala
+
+test_class_signal_performance_SOURCES =		\
+	test-class-signal-performance.vala.stamp	\
+	$(test_class_signal_performance_VALASOURCES:.vala=.c)
+
+test-class-signal-performance.vala.stamp: $(test_class_signal_performance_VALASOURCES) $(direct_vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
+	$(AM_V_GEN)touch $@
+
+test_class_signal_performance_LDADD =			\
+	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
+	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)					\
+	$(DBUS_LIBS)
+
+test_update_array_performance_LDADD =			\
+	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
+	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)					\
+	$(GIO_LIBS)					\
+	$(GLIB2_LIBS)					\
+	$(DBUS_LIBS)
+
+BUILT_SOURCES =					\
+	test-busy-handling.vala.stamp			\
+	test-class-signal.vala.stamp			\
+	test-class-signal-performance.vala.stamp	\
+	test-direct-query.vala.stamp			\
+	test-bus-query.vala.stamp			\
+	test-default-update.vala.stamp			\
+	test-bus-update.vala.stamp
+
+EXTRA_DIST =						\
+	$(BUILT_SOURCES)				\
+	$(test_busy_handling_VALASOURCES)		\
+	$(test_class_signal_VALASOURCES)		\
+	$(test_class_signal_performance_VALASOURCES)	\
+	$(test_direct_query_VALASOURCES)		\
+	$(test_default_update_VALASOURCES)		\
+	$(test_bus_query_VALASOURCES)			\
+	$(test_bus_update_VALASOURCES)
+
+MAINTAINERCLEANFILES =					\
+	$(BUILT_SOURCES)				\
+	$(test_busy_handling_VALASOURCES:.vala=.c)	\
+	$(test_class_signal_VALASOURCES:.vala=.c)	\
+	$(test_class_signal_performance_VALASOURCES:.vala=.c) \
+	$(test_bus_query_VALASOURCES:.vala=.c)		\
+	$(test_bus_update_VALASOURCES:.vala=.c)		\
+	$(test_direct_query_VALASOURCES:.vala=.c)	\
+	$(test_default_update_VALASOURCES:.vala=.c)
diff --git a/tests/functional-tests/bus-query-test.vala b/tests/functional-tests/ipc/test-bus-query.vala
index 1867fed46..1867fed46 100644
--- a/tests/functional-tests/bus-query-test.vala
+++ b/tests/functional-tests/ipc/test-bus-query.vala
diff --git a/tests/functional-tests/bus-update-test.vala b/tests/functional-tests/ipc/test-bus-update.vala
index 1867fed46..1867fed46 100644
--- a/tests/functional-tests/bus-update-test.vala
+++ b/tests/functional-tests/ipc/test-bus-update.vala
diff --git a/tests/functional-tests/busy-handling-test.vala b/tests/functional-tests/ipc/test-busy-handling.vala
index 9f9885b36..9f9885b36 100644
--- a/tests/functional-tests/busy-handling-test.vala
+++ b/tests/functional-tests/ipc/test-busy-handling.vala
diff --git a/tests/functional-tests/class-signal-performance-test.vala b/tests/functional-tests/ipc/test-class-signal-performance.vala
index 02e215533..02e215533 100644
--- a/tests/functional-tests/class-signal-performance-test.vala
+++ b/tests/functional-tests/ipc/test-class-signal-performance.vala
diff --git a/tests/functional-tests/class-signal-test.vala b/tests/functional-tests/ipc/test-class-signal.vala
index 2a773a45a..2a773a45a 100644
--- a/tests/functional-tests/class-signal-test.vala
+++ b/tests/functional-tests/ipc/test-class-signal.vala
diff --git a/tests/functional-tests/default-update-test.vala b/tests/functional-tests/ipc/test-default-update.vala
index 3f7424d84..3f7424d84 100644
--- a/tests/functional-tests/default-update-test.vala
+++ b/tests/functional-tests/ipc/test-default-update.vala
diff --git a/tests/functional-tests/direct-query-test.vala b/tests/functional-tests/ipc/test-direct-query.vala
index a322a4a96..a322a4a96 100644
--- a/tests/functional-tests/direct-query-test.vala
+++ b/tests/functional-tests/ipc/test-direct-query.vala
diff --git a/tests/functional-tests/shared-query-test.vala b/tests/functional-tests/ipc/test-shared-query.vala
index 3fb930c75..3fb930c75 100644
--- a/tests/functional-tests/shared-query-test.vala
+++ b/tests/functional-tests/ipc/test-shared-query.vala
diff --git a/tests/functional-tests/shared-update-test.vala b/tests/functional-tests/ipc/test-shared-update.vala
index f251e976b..f251e976b 100644
--- a/tests/functional-tests/shared-update-test.vala
+++ b/tests/functional-tests/ipc/test-shared-update.vala
diff --git a/tests/functional-tests/update-array-performance-test.c b/tests/functional-tests/ipc/test-update-array-performance.c
index 3f0d7262c..3f0d7262c 100644
--- a/tests/functional-tests/update-array-performance-test.c
+++ b/tests/functional-tests/ipc/test-update-array-performance.c