diff options
| author | Tristan Van Berkom <tristanvb@openismus.com> | 2013-11-30 01:19:30 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristanvb@openismus.com> | 2013-11-30 03:36:29 +0900 |
| commit | 67b446aacd1d85e3ebcdcf5dafc3932076174c79 (patch) | |
| tree | 30c6a3f267272e3aa7daeda940dfabab05fb4870 /tests/test-server-utils | |
| parent | caed507ce7db421c0dadd98d489b37e2aab264f6 (diff) | |
| download | evolution-data-server-67b446aacd1d85e3ebcdcf5dafc3932076174c79.tar.gz | |
Revert "test-server-utils: Disable the cache-reaper in the test environment"
This reverts commit fcdad7cc7779692d6a63d194c55ed3ac1bca0f3c.
Diffstat (limited to 'tests/test-server-utils')
| -rw-r--r-- | 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 0ba818a9e..202f62cf1 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) \ |