From d0a1545fff6e4e321f4cb1de531d2fc2fba68ce2 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 6 Oct 2012 15:49:07 +0200 Subject: [PATCH] fix a few tests to better run in an utf-8 locale --- tests/config/recoll.conf | 2 -- tests/lyx/lyx.txt | 5 ++--- tests/notypes/notypes.txt | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/config/recoll.conf b/tests/config/recoll.conf index 980bd5b7..1c0f0f93 100644 --- a/tests/config/recoll.conf +++ b/tests/config/recoll.conf @@ -15,8 +15,6 @@ daemSkippedPaths = \ /home/dockes/projets/fulltext/testrecoll/skipped/real* \ /home/dockes/projets/fulltext/testrecoll/config -defaultcharset = iso-8859-1 - [/home/dockes/projets/fulltext/testrecoll/utf8] defaultcharset = utf-8 [/home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R] diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt index 5a061c83..dfff4844 100644 --- a/tests/lyx/lyx.txt +++ b/tests/lyx/lyx.txt @@ -1,7 +1,6 @@ -3 results +2 results +application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/accentué.lyx] [accentué.lyx] 3577 bytes application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/fr_splash.lyx] [fr_splash.lyx] 3577 bytes -application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/accentué.lyx] [accentué.lyx] 3577 bytes -application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/accentué.lyx] [accentué.lyx] 3577 bytes 2 results application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/splash.lyx] [splash.lyx] 2974 bytes application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/with spaces.lyx] [with spaces.lyx] 2974 bytes diff --git a/tests/notypes/notypes.txt b/tests/notypes/notypes.txt index b42cac7c..12de997a 100644 --- a/tests/notypes/notypes.txt +++ b/tests/notypes/notypes.txt @@ -1,4 +1,4 @@ -1 results -application/x-empty [file:///home/dockes/projets/fulltext/testrecoll/notypes/nerv_uniqueTerm.xfy] [énervé_uniqueTerm.xfy] 0 bytes -1 results +1 results +application/x-empty [file:///home/dockes/projets/fulltext/testrecoll/notypes/énervé_uniqueTerm.xfy] [énervé_uniqueTerm.xfy] 0 bytes +1 results text/plain [file:///home/dockes/projets/fulltext/testrecoll/notypes/notype1.xfx] [notype1.xfx] 64 bytes