[tracker/direct-access] libtracker-db tests moved to libtracker-data
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/direct-access] libtracker-db tests moved to libtracker-data
- Date: Thu, 22 Jul 2010 11:31:22 +0000 (UTC)
commit fa396b7ae644b23414f440996e48108eda92908c
Author: Aleksander Morgado <aleksander lanedo com>
Date: Thu Jul 22 13:03:37 2010 +0200
libtracker-db tests moved to libtracker-data
configure.ac | 1 -
tests/libtracker-data/.gitignore | 4 +
tests/libtracker-data/Makefile.am | 97 +++++++++++++++++-
.../example.index | Bin 1319 -> 1319 bytes
.../run-test-in-tmp-dir.sh | 0
.../tracker-db-dbus-test.c | 0
.../tracker-db-journal.c | 0
.../tracker-db-manager-common.c | 0
.../tracker-db-manager-common.h | 0
.../tracker-db-manager-test-attach.c | 0
.../tracker-db-manager-test-custom.c | 0
.../tracker-db-manager-test-unattach.c | 0
tests/libtracker-db/.gitignore | 4 -
tests/libtracker-db/Makefile.am | 113 --------------------
14 files changed, 100 insertions(+), 119 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c371dfd..c7d555c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1921,7 +1921,6 @@ AC_CONFIG_FILES([
tests/libtracker-data/backup/Makefile
tests/libtracker-data/turtle/Makefile
tests/libtracker-miner/Makefile
- tests/libtracker-db/Makefile
tests/libtracker-fts/Makefile
tests/libtracker-fts/limits/Makefile
tests/libtracker-fts/prefix/Makefile
diff --git a/tests/libtracker-data/.gitignore b/tests/libtracker-data/.gitignore
index f46087c..5be8339 100644
--- a/tests/libtracker-data/.gitignore
+++ b/tests/libtracker-data/.gitignore
@@ -4,3 +4,7 @@ tracker-ontology
tracker-ontology-change
tracker-sparql
tracker-sparql-blank
+tracker-db-dbus
+tracker-db-journal
+tracker-index-writer
+tracker-store.journal
\ No newline at end of file
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index 76df8df..3b8bcd4 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -24,12 +24,32 @@ SUBDIRS = \
noinst_PROGRAMS = $(TEST_PROGS)
+#
+# NOTE: Some of these tests have been disabled (by Martyn) temporarily
+# because make distcheck fails. The reason for this is that it
+# depends files being installed to $prefix/share which have not
+# been installed at this point.
+#
+# These tests include:
+#
+# tracker-db-manager-unattach
+# tracker-db-manager-attach
+# tracker-db-manager-custom
+#
+
+
TEST_PROGS += \
tracker-sparql \
tracker-sparql-blank \
tracker-ontology \
tracker-backup \
- tracker-ontology-change
+ tracker-ontology-change \
+ tracker-db-journal \
+ tracker-db-dbus
+
+# tracker-db-manager-unattach \
+# tracker-db-manager-attach \
+# tracker-db-manager-custom
INCLUDES = \
-DTRACKER_COMPILATION \
@@ -82,6 +102,81 @@ tracker_backup_SOURCES = \
tracker_backup_LDADD = $(common_ldadd)
+
+tracker_db_journal_SOURCES = \
+ tracker-db-journal.c
+
+tracker_db_journal_LDADD = \
+ $(top_builddir)/src/libtracker-data/libtracker-data.la \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/tests/common/libtracker-testcommon.la \
+ $(SQLITE3_LIBS) \
+ $(GMODULE_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GLIB2_LIBS) \
+ -lz
+
+tracker_db_dbus_SOURCES = \
+ tracker-db-dbus-test.c
+
+tracker_db_dbus_LDADD = \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-data/libtracker-data.la \
+ $(top_builddir)/tests/common/libtracker-testcommon.la \
+ $(SQLITE3_LIBS) \
+ $(GMODULE_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GLIB2_LIBS) \
+ -lz
+
+#
+# tracker_db_manager_attach_SOURCES = \
+# tracker-db-manager-test-attach.c \
+# tracker-db-manager-common.c \
+# tracker-db-manager-common.h
+#
+# tracker_db_manager_attach_LDADD = \
+# $(top_builddir)/src/libtracker-data/libtracker-data.la \
+# $(top_builddir)/src/libtracker-common/libtracker-common.la \
+# $(top_builddir)/tests/common/libtracker-testcommon.la \
+# $(SQLITE3_LIBS) \
+# $(GMODULE_LIBS) \
+# $(GTHREAD_LIBS) \
+# $(GLIB2_LIBS) \
+# -lz
+#
+# tracker_db_manager_unattach_SOURCES = \
+# tracker-db-manager-test-unattach.c \
+# tracker-db-manager-common.c \
+# tracker-db-manager-common.h
+#
+# tracker_db_manager_unattach_LDADD = \
+# $(top_builddir)/src/libtracker-data/libtracker-data.la \
+# $(top_builddir)/src/libtracker-common/libtracker-common.la \
+# $(top_builddir)/tests/common/libtracker-testcommon.la \
+# $(SQLITE3_LIBS) \
+# $(GMODULE_LIBS) \
+# $(GTHREAD_LIBS) \
+# $(GLIB2_LIBS) \
+# -lz
+#
+# tracker_db_manager_custom_SOURCES = \
+# tracker-db-manager-test-custom.c \
+# tracker-db-manager-common.c \
+# tracker-db-manager-common.h
+#
+# tracker_db_manager_custom_LDADD = \
+# $(top_builddir)/src/libtracker-data/libtracker-data.la \
+# $(top_builddir)/src/libtracker-common/libtracker-common.la \
+# $(top_builddir)/tests/common/libtracker-testcommon.la \
+# $(SQLITE3_LIBS) \
+# $(GMODULE_LIBS) \
+# $(GTHREAD_LIBS) \
+# $(GLIB2_LIBS) \
+# -lz
+
+
+
EXTRA_DIST = \
dawg-testcases \
change/source/99-example.ontology.v1 \
diff --git a/tests/libtracker-db/example.index b/tests/libtracker-data/example.index
similarity index 100%
rename from tests/libtracker-db/example.index
rename to tests/libtracker-data/example.index
diff --git a/tests/libtracker-db/run-test-in-tmp-dir.sh b/tests/libtracker-data/run-test-in-tmp-dir.sh
similarity index 100%
rename from tests/libtracker-db/run-test-in-tmp-dir.sh
rename to tests/libtracker-data/run-test-in-tmp-dir.sh
diff --git a/tests/libtracker-db/tracker-db-dbus-test.c b/tests/libtracker-data/tracker-db-dbus-test.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-dbus-test.c
rename to tests/libtracker-data/tracker-db-dbus-test.c
diff --git a/tests/libtracker-db/tracker-db-journal.c b/tests/libtracker-data/tracker-db-journal.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-journal.c
rename to tests/libtracker-data/tracker-db-journal.c
diff --git a/tests/libtracker-db/tracker-db-manager-common.c b/tests/libtracker-data/tracker-db-manager-common.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-manager-common.c
rename to tests/libtracker-data/tracker-db-manager-common.c
diff --git a/tests/libtracker-db/tracker-db-manager-common.h b/tests/libtracker-data/tracker-db-manager-common.h
similarity index 100%
rename from tests/libtracker-db/tracker-db-manager-common.h
rename to tests/libtracker-data/tracker-db-manager-common.h
diff --git a/tests/libtracker-db/tracker-db-manager-test-attach.c b/tests/libtracker-data/tracker-db-manager-test-attach.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-manager-test-attach.c
rename to tests/libtracker-data/tracker-db-manager-test-attach.c
diff --git a/tests/libtracker-db/tracker-db-manager-test-custom.c b/tests/libtracker-data/tracker-db-manager-test-custom.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-manager-test-custom.c
rename to tests/libtracker-data/tracker-db-manager-test-custom.c
diff --git a/tests/libtracker-db/tracker-db-manager-test-unattach.c b/tests/libtracker-data/tracker-db-manager-test-unattach.c
similarity index 100%
rename from tests/libtracker-db/tracker-db-manager-test-unattach.c
rename to tests/libtracker-data/tracker-db-manager-test-unattach.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]