small test fixups

This commit is contained in:
Jean-Francois Dockes 2012-10-06 12:11:51 +02:00
parent 720f113d42
commit d29719e0f1
5 changed files with 10 additions and 15 deletions

View File

@ -17,12 +17,6 @@ daemSkippedPaths = \
defaultcharset = iso-8859-1 defaultcharset = iso-8859-1
unac_except_trans = åå Åå ää Ää öö Öö
[/home/dockes/projets/fulltext/testrecoll/special]
defaultcharset = iso-8859-1
[/home/dockes/projets/fulltext/testrecoll/txt]
defaultcharset = iso-8859-1
[/home/dockes/projets/fulltext/testrecoll/utf8] [/home/dockes/projets/fulltext/testrecoll/utf8]
defaultcharset = utf-8 defaultcharset = utf-8
[/home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R] [/home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R]

View File

@ -55,4 +55,3 @@ recollq template
diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
checkresult checkresult
rm -f index.pid

View File

@ -8,9 +8,7 @@ initvariables $0
( (
recollq 'Bienvenue Dans Univers De Lyx' recollq 'Bienvenue Dans Univers De Lyx'
recollq 'Welcome To Lyx' recollq 'Welcome To Lyx'
recollq 'LyX rendkivul jol dokumentalt' recollq 'LyX jol dokumentalt'
# cant use this one because o-diaeresis is in the swedish unacex
# recollq 'Udvozli Ont A LyX'
) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout
diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1

View File

@ -5,10 +5,12 @@ topdir=`dirname $0`/..
initvariables $0 initvariables $0
recollq Enerve_uniqueTerm 2> $mystderr | (
egrep -v '^Recoll query: ' > $mystdout
recollq notype1_uniqueterm 2>> $mystderr | recollq Enerve_uniqueTerm
egrep -v '^Recoll query: ' >> $mystdout recollq notype1_uniqueterm
) 2>&1 | egrep -v '^Recoll query: ' > $mystdout
diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1

View File

@ -54,8 +54,10 @@ checkresult() {
fatal '*** ' $myname FAILED fatal '*** ' $myname FAILED
else else
rm -f $mydiffs rm -f $mydiffs
# for tests with a local index # for tests with a local index
rm -rf xapiandb aspdict.* missing recoll.conf rm -rf history idxstatus.txt index.pid missing recoll.conf xapiandb mimeview
rm -rf aspdict.*
exit 0 exit 0
fi fi
} }