[evolution-data-server] Revert "test-server-utils: Disable the cache-reaper in the test environment"
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Revert "test-server-utils: Disable the cache-reaper in the test environment"
- Date: Fri, 29 Nov 2013 18:39:02 +0000 (UTC)
commit 67b446aacd1d85e3ebcdcf5dafc3932076174c79
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Sat Nov 30 01:19:30 2013 +0900
Revert "test-server-utils: Disable the cache-reaper in the test environment"
This reverts commit fcdad7cc7779692d6a63d194c55ed3ac1bca0f3c.
tests/test-server-utils/Makefile.am | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/tests/test-server-utils/Makefile.am b/tests/test-server-utils/Makefile.am
index 0ba818a..202f62c 100644
--- a/tests/test-server-utils/Makefile.am
+++ b/tests/test-server-utils/Makefile.am
@@ -4,13 +4,6 @@ SUBDIRS = services
@GNOME_CODE_COVERAGE_RULES@
-# The registry modules used to point here:
-# -DEDS_TEST_REGISTRY_DIR=\""$(abs_top_builddir)/modules/cache-reaper/.libs"
-#
-# But this causes ./tests/libebook/client/test-client-cursor-operations to race
-# against the cache reaper, now we're just ensuring there is no cache reaper
-# in the test environment, note that the above test runs fine with
-# TEST_INSTALLED_SERVICES=1
common_cflags = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
@@ -25,7 +18,7 @@ common_cflags = \
-DEDS_TEST_SCHEMA_DIR=\""$(abs_top_builddir)/data"\" \
-DEDS_TEST_ADDRESS_BOOK_DIR=\""$(abs_top_builddir)/addressbook/backends/file/.libs"\" \
-DEDS_TEST_CALENDAR_DIR=\""$(abs_top_builddir)/calendar/backends/file/.libs"\" \
- -DEDS_TEST_REGISTRY_DIR=\""$(abs_top_builddir)/"\" \
+ -DEDS_TEST_REGISTRY_DIR=\""$(abs_top_builddir)/modules/cache-reaper/.libs"\" \
-DEDS_TEST_CAMEL_DIR=\""$(abs_top_builddir)/camel/providers/local/.libs"\" \
$(E_DATA_SERVER_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]