tracker r2029 - in branches/indexer-split: . tests tests/libtracker-db tests/tracker-indexer tests/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Thu Aug  7 12:28:19 2008
New Revision: 2029
URL: http://svn.gnome.org/viewvc/tracker?rev=2029&view=rev

Log:
Moved the index tests to the proper location

Added:
   branches/indexer-split/tests/libtracker-db/example.index
      - copied unchanged from r2027, /branches/indexer-split/tests/trackerd/example.index
   branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c
      - copied unchanged from r2028, /branches/indexer-split/tests/trackerd/tracker-index-test.c
   branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c
      - copied unchanged from r2027, /branches/indexer-split/tests/tracker-indexer/tracker-index-test.c
Removed:
   branches/indexer-split/tests/tracker-indexer/
   branches/indexer-split/tests/trackerd/example.index
   branches/indexer-split/tests/trackerd/tracker-index-test.c
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/tests/Makefile.am
   branches/indexer-split/tests/libtracker-db/Makefile.am
   branches/indexer-split/tests/trackerd/Makefile.am

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Thu Aug  7 12:28:19 2008
@@ -747,7 +747,6 @@
 	src/tracker-preferences/tracker-preferences.desktop.in	
 	src/trackerd/Makefile
 	tests/Makefile
-	tests/tracker-indexer/Makefile
 	tests/common/Makefile
 	tests/libtracker-common/Makefile
 	tests/trackerd/Makefile

Modified: branches/indexer-split/tests/Makefile.am
==============================================================================
--- branches/indexer-split/tests/Makefile.am	(original)
+++ branches/indexer-split/tests/Makefile.am	Thu Aug  7 12:28:19 2008
@@ -4,6 +4,5 @@
 	libtracker-common \
 	trackerd \
 	scripts \
-	libtracker-db \
-	tracker-indexer
+	libtracker-db
 

Modified: branches/indexer-split/tests/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/tests/libtracker-db/Makefile.am	(original)
+++ branches/indexer-split/tests/libtracker-db/Makefile.am	Thu Aug  7 12:28:19 2008
@@ -6,7 +6,9 @@
 	tracker-db-manager-attach         \
 	tracker-db-manager-custom         \
 	tracker-db-dbus			\
-	union-performance
+	union-performance		\
+	tracker-index-reader		\
+	tracker-index-writer
 
 INCLUDES = 				\
 	-g 				\
@@ -98,3 +100,31 @@
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							\
 	-lz
+
+
+tracker_index_writer_SOURCES = \
+	tracker-index-writer-test.c
+
+tracker_index_writer_LDADD =							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(top_builddir)/src/libtracker-db/libtracker-db.la	 	\
+	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(QDBM_LIBS)							\
+	$(GMODULE_LIBS)							\
+	$(GTHREAD_LIBS)							\
+	$(GLIB2_LIBS)							
+
+
+tracker_index_reader_SOURCES = \
+	tracker-index-reader-test.c 
+
+tracker_index_reader_LDADD = \
+	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+	$(GMODULE_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(GLIB2_LIBS) \
+	$(DBUS_LIBS) \
+	$(GIO_LIBS) \
+	$(QDBM_LIBS) 
+

Modified: branches/indexer-split/tests/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/tests/trackerd/Makefile.am	(original)
+++ branches/indexer-split/tests/trackerd/Makefile.am	Thu Aug  7 12:28:19 2008
@@ -43,18 +43,3 @@
 
 endif
 
-TEST_PROGS += tracker-index
-
-tracker_index_SOURCES = \
-	tracker-index-test.c 
-
-tracker_index_LDADD = \
-	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
-	$(GMODULE_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(GLIB2_LIBS) \
-	$(DBUS_LIBS) \
-	$(GIO_LIBS) \
-	$(QDBM_LIBS) 
-