small test fixups

tests/config/recoll.conf

@@ -17,12 +17,6 @@ daemSkippedPaths =  \
 
 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]
 defaultcharset = utf-8
 [/home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R]

tests/indexedmimetypes/indexedmimetypes.sh

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

tests/lyx/lyx.sh

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

tests/notypes/notypes.sh

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

tests/shared.sh

@@ -54,8 +54,10 @@ checkresult() {
     fatal '*** ' $myname FAILED
   else
     rm -f $mydiffs
+
     # 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
   fi
 }