fix to get test suite running

svn path=/trunk/; revision=416

2 files changed, 44 insertions, 40 deletions

diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am
index b0a2a1b6f..fd5263665 100644
--- a/src/trackerd/Makefile.am
+++ b/src/trackerd/Makefile.am
@@ -43,19 +43,7 @@ db_sources =				\
 	tracker-db-email.c		\
 	tracker-db-email.h
 
-
-bin_PROGRAMS = trackerd
-check_PROGRAMS = test-tracker-indexer
-
-test_tracker_indexer_SOURCES =		\
-	depot.c				\
-	depot.h				\
-	curia.c				\
-	curia.h				\
-	tracker-indexer.c		\
-	test-tracker-indexer.c		\
-	tracker-utils.c			\
-	tracker-utils.h			\
+xdgmime_sources =			\
 	xdgmime.c			\
 	xdgmime.h			\
 	xdgmimealias.c			\
@@ -70,6 +58,29 @@ test_tracker_indexer_SOURCES =		\
 	xdgmimemagic.h			\
 	xdgmimeparent.c			\
 	xdgmimeparent.h
+
+qdbm_sources =				\
+	depot.c				\
+	depot.h				\
+	curia.c				\
+	curia.h				\
+	myconf.h			\
+	myconf.c
+
+bin_PROGRAMS = trackerd
+
+TESTS = test-tracker-indexer
+
+check_PROGRAMS = $(TESTS)
+
+test_tracker_indexer_SOURCES =		\
+	tracker-indexer.c		\
+	test-tracker-indexer.c		\
+	tracker-utils.c			\
+	tracker-utils.h			\
+	$(xdgmime_sources)		\
+	$(qdbm_sources)
+
 test_tracker_indexer_LDADD = 		\
 	$(GLIB2_LIBS)			\
 	$(GTHREAD_LIBS)			\
@@ -80,12 +91,9 @@ trackerd_SOURCES =			\
 	trackerd.c			\
 	$(inotify_sources)		\
 	$(fam_sources)			\
-	depot.c				\
-	depot.h				\
-	curia.c				\
-	curia.h				\
-	myconf.h			\
-	myconf.c			\
+	$(qdbm_sources)			\
+	$(db_sources)			\
+	$(xdgmime_sources)		\
 	tracker-db.c			\
 	tracker-db.h			\
 	tracker-dbus.c			\
@@ -100,7 +108,6 @@ trackerd_SOURCES =			\
 	tracker-dbus-keywords.h		\
 	tracker-dbus-search.c		\
 	tracker-dbus-search.h		\
-	$(db_sources)			\
 	tracker-email.c			\
 	tracker-email.h			\
 	tracker-email-utils.c		\
@@ -120,21 +127,7 @@ trackerd_SOURCES =			\
 	tracker-utils.c			\
 	tracker-utils.h			\
 	tracker-ioprio.c		\
-	tracker-ioprio.h		\
-	xdgmime.c			\
-	xdgmime.h			\
-	xdgmimealias.c			\
-	xdgmimealias.h			\
-	xdgmimecache.c			\
-	xdgmimecache.h			\
-	xdgmimeglob.c			\
-	xdgmimeglob.h			\
-	xdgmimeint.c			\
-	xdgmimeint.h			\
-	xdgmimemagic.c			\
-	xdgmimemagic.h			\
-	xdgmimeparent.c			\
-	xdgmimeparent.h
+	tracker-ioprio.h
 
 
 trackerd_LDADD =			\
diff --git a/src/trackerd/test-tracker-indexer.c b/src/trackerd/test-tracker-indexer.c
index 966c42f4f..71ecae819 100644
--- a/src/trackerd/test-tracker-indexer.c
+++ b/src/trackerd/test-tracker-indexer.c
@@ -319,14 +319,18 @@ int
 main (int argc, char **argv)
 {
 	int a;
-	
-	tracker = NULL;
+	char *test_db;
+
+	tracker = g_new (Tracker, 1);
 
 	if (!g_thread_supported ()) {
 		g_thread_init (NULL);
 	}
 
-	unlink ("/home/jamie/.Tracker/Indexes/test");
+	test_db = g_build_filename (g_get_home_dir(), ".Tracker", "databases", "test", NULL);
+
+	// TODO Delete directory recursively
+	g_rmdir (test_db);
 
 	file_indexer = tracker_indexer_open ("test");
 
@@ -340,7 +344,8 @@ main (int argc, char **argv)
 
 	tracker_indexer_close (file_indexer);	
 
-	unlink ("/home/jamie/.Tracker/Indexes/test");
+	// TODO Delete directory recursively
+	g_rmdir (test_db);
 
 	file_indexer = tracker_indexer_open ("test");
 
@@ -350,13 +355,19 @@ main (int argc, char **argv)
 
 	tracker_indexer_close (file_indexer);	
 
+	// TODO Delete directory recursively
+	g_rmdir (test_db);
 		
+	g_free(test_db);
+	g_free(tracker);
 
 	if (fail_count == 0) {
 		tracker_log ("\n\n\nSUCESS : Test passed all results :))))");
 	} else {
 		tracker_log ("\n\n\nFAILURE : test failed %d times", fail_count);
+		return EXIT_FAILURE;
+
 	}
 
-	exit (1);
+	return EXIT_SUCCESS;
 }