dovecot-2.2: lib-fts: Fixed test-fts-language to use TEXTCAT_DAT...

dovecot at dovecot.org dovecot at dovecot.org
Mon Apr 20 14:34:45 UTC 2015


details:   http://hg.dovecot.org/dovecot-2.2/rev/9b777c7ede0d
changeset: 18420:9b777c7ede0d
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 20 17:33:09 2015 +0300
description:
lib-fts: Fixed test-fts-language to use TEXTCAT_DATADIR
This may still make too many assumptions about what data exists where.. So
we may need to remove this test from "make check". But for now leave it
there.

diffstat:

 src/lib-fts/Makefile.am         |  1 -
 src/lib-fts/test-fts-language.c |  4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 56228757382d -r 9b777c7ede0d src/lib-fts/Makefile.am
--- a/src/lib-fts/Makefile.am	Mon Apr 20 17:24:37 2015 +0300
+++ b/src/lib-fts/Makefile.am	Mon Apr 20 17:33:09 2015 +0300
@@ -7,7 +7,6 @@
 	$(LIBFTS_NORMALIZER_CFLAGS) \
 	-DUDHRDIR=\""$(top_srcdir)/src/lib-fts"\" \
 	-DDATADIR=\"$(pkgdatadir)\" \
-	-DTEST_TEXTCAT_DIR=\""$(top_srcdir)/ext/libexttextcat/langclass"\" \
 	-DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts"\"
 
 stopwordsdir = $(datadir)/${PACKAGE_TARNAME}/stopwords
diff -r 56228757382d -r 9b777c7ede0d src/lib-fts/test-fts-language.c
--- a/src/lib-fts/test-fts-language.c	Mon Apr 20 17:24:37 2015 +0300
+++ b/src/lib-fts/test-fts-language.c	Mon Apr 20 17:33:09 2015 +0300
@@ -7,8 +7,8 @@
    As such, they are not really unit test to be coupled with the build. */
 
 const char *const settings[] =
-	{"fts_language_config", TEST_TEXTCAT_DIR"/fpdb.conf",
-	 "fts_language_data", TEST_TEXTCAT_DIR"/LM/", NULL};
+	{"fts_language_config", TEXTCAT_DATADIR"/fpdb.conf",
+	 "fts_language_data", TEXTCAT_DATADIR"/", NULL};
 
 /* Detect Finnish. fi--utf8 */
 static void test_fts_language_detect_finnish(void)


More information about the dovecot-cvs mailing list