-I$(top_srcdir)/tests/test-server-utils \
-I$(top_builddir)/tests/test-server-utils \
-DSRCDIR=\""$(abs_srcdir)"\" \
+ -DINSTALLED_TEST_DIR=\""$(pkglibexecdir)/installed-tests"\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(CAMEL_CFLAGS) \
noinst_PROGRAMS = $(TESTS)
-EXTRA_DIST = \
+TEST_VCARDS = \
$(srcdir)/data/vcards/name-only.vcf \
$(srcdir)/data/vcards/simple-1.vcf \
$(srcdir)/data/vcards/simple-2.vcf \
$(srcdir)/data/vcards/custom-15.vcf \
$(NULL)
+if EDS_INSTALLED_TESTS_ENABLED
+vcardsdir = ${pkglibexecdir}/installed-tests/vcards
+vcards_DATA = $(TEST_VCARDS)
+endif
+
+EXTRA_DIST = $(TEST_VCARDS)
+
+
+
test_ebook_commit_contact_LDADD=$(TEST_LIBS)
test_ebook_commit_contact_CPPFLAGS=$(TEST_CPPFLAGS)
test_ebook_get_book_view_LDADD=$(TEST_LIBS)
-I$(top_srcdir)/private \
-I$(top_builddir)/private \
-DSRCDIR=\""$(abs_srcdir)"\" \
+ -DINSTALLED_TEST_DIR=\""$(pkglibexecdir)/installed-tests"\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(CAMEL_CFLAGS) \
gchar *vcard;
case_filename = g_strdup_printf ("%s.vcf", case_name);
- filename = g_build_filename (SRCDIR, "..", "data", "vcards", case_filename, NULL);
+
+ /* In the case of installed tests, they run in ${pkglibexecdir}/installed-tests
+ * and the vcards are installed in ${pkglibexecdir}/installed-tests/vcards
+ */
+ if (g_getenv ("TEST_INSTALLED_SERVICES") != NULL)
+ filename = g_build_filename (INSTALLED_TEST_DIR, "vcards", case_filename, NULL);
+ else
+ filename = g_build_filename (SRCDIR, "..", "data", "vcards", case_filename, NULL);
+
file = g_file_new_for_path (filename);
if (!g_file_load_contents (file, NULL, &vcard, NULL, NULL, &error)) {
g_warning (
gchar *vcard;
case_filename = g_strdup_printf ("%s.vcf", case_name);
- filename = g_build_filename (SRCDIR, EBOOK_TEST_UTILS_DATA_DIR, EBOOK_TEST_UTILS_VCARDS_DIR, case_filename, NULL);
+
+ /* In the case of installed tests, they run in ${pkglibexecdir}/installed-tests
+ * and the vcards are installed in ${pkglibexecdir}/installed-tests/vcards
+ */
+ if (g_getenv ("TEST_INSTALLED_SERVICES") != NULL)
+ filename = g_build_filename (INSTALLED_TEST_DIR, "vcards", case_filename, NULL);
+ else
+ filename = g_build_filename (SRCDIR, EBOOK_TEST_UTILS_DATA_DIR, EBOOK_TEST_UTILS_VCARDS_DIR, case_filename, NULL);
+
file = g_file_new_for_path (filename);
if (!g_file_load_contents (file, NULL, &vcard, NULL, NULL, &error)) {
g_warning (
-DDATADIR=\"$(datadir)\" \
-DSRCDIR=\""$(abs_srcdir)"\" \
-DBUILDDIR=\""$(abs_topbuilddir)"\" \
+ -DINSTALLED_TEST_DIR=\""$(pkglibexecdir)/installed-tests"\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
gchar *vcard;
case_filename = g_strdup_printf ("%s.vcf", case_name);
- filename = g_build_filename (SRCDIR, "..", "libebook", "data", "vcards", case_filename, NULL);
+
+ /* In the case of installed tests, they run in ${pkglibexecdir}/installed-tests
+ * and the vcards are installed in ${pkglibexecdir}/installed-tests/vcards
+ */
+ if (g_getenv ("TEST_INSTALLED_SERVICES") != NULL)
+ filename = g_build_filename (INSTALLED_TEST_DIR, "vcards", case_filename, NULL);
+ else
+ filename = g_build_filename (SRCDIR, "..", "libebook", "data", "vcards", case_filename, NULL);
+
file = g_file_new_for_path (filename);
if (!g_file_load_contents (file, NULL, &vcard, NULL, NULL, &error))
g_error ("failed to read test contact file '%s': %s",
g_object_unref);
/* Cleanup from last test */
- directory = g_build_filename (SRCDIR, "cache", NULL);
+ directory = g_build_filename (g_get_tmp_dir (), "test-sqlite-cache", NULL);
delete_work_directory (directory);
g_free (directory);
-
- filename = g_build_filename (SRCDIR, "cache", "contacts.db", NULL);
+ filename = g_build_filename (g_get_tmp_dir (), "test-sqlite-cache", "contacts.db", NULL);
if (closure->setup_summary)
setup = closure->setup_summary ();