From 2a424b5eaef19d2dd4c92e46828dcb90ba58fb07 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 5 Jan 2013 15:36:25 +0100 Subject: [PATCH] adjusted results for ordering etc. on new machine --- tests/badsuffs1/badsuffs1.sh | 7 ++++--- tests/badsuffs1/badsuffs1.txt | 6 +++--- tests/casediac/casediac.txt | 6 +++--- tests/dates/dates.sh | 2 +- tests/dir/dir.sh | 16 ++++++++++++++++ tests/dir/dir.txt | 2 ++ tests/empty/empty.txt | 4 ++-- tests/kar/kar.sh | 4 ++-- tests/lyx/lyx.sh | 6 +++--- tests/lyx/lyx.txt | 2 +- tests/notypes/notypes.txt | 2 +- tests/tar/tar.sh | 2 +- tests/tar/tar.txt | 2 +- tests/txt/txt.sh | 4 ++-- tests/txt/txt.txt | 2 +- tests/xml/xml.sh | 6 +++--- 16 files changed, 46 insertions(+), 27 deletions(-) create mode 100755 tests/dir/dir.sh create mode 100644 tests/dir/dir.txt diff --git a/tests/badsuffs1/badsuffs1.sh b/tests/badsuffs1/badsuffs1.sh index 4b848c3b..ea9c6bfc 100755 --- a/tests/badsuffs1/badsuffs1.sh +++ b/tests/badsuffs1/badsuffs1.sh @@ -4,10 +4,11 @@ topdir=`dirname $0`/.. . $topdir/shared.sh initvariables $0 +( + # File names for files with skipped suffixes should be indexed + recollq -S mtime Badsufffilename -# File names for files with skipped suffixes should be indexed -recollq Badsufffilename 2> $mystderr | - egrep -v '^Recoll query: ' > $mystdout +) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/badsuffs1/badsuffs1.txt b/tests/badsuffs1/badsuffs1.txt index 62d2cb5b..7086c2bb 100644 --- a/tests/badsuffs1/badsuffs1.txt +++ b/tests/badsuffs1/badsuffs1.txt @@ -1,7 +1,7 @@ 6 results -application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2] [badsufffilename.tar.bz2] 19 bytes -application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz] [badsufffilename.tgz] 19 bytes [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz] [badsufffilename.log.gz] 19 bytes -application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz] [badsufffilename.tbz] 19 bytes [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5] [badsufffilename.md5] 19 bytes +application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2] [badsufffilename.tar.bz2] 19 bytes application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz] [badsufffilename.tar.gz] 19 bytes +application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz] [badsufffilename.tbz] 19 bytes +application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz] [badsufffilename.tgz] 19 bytes diff --git a/tests/casediac/casediac.txt b/tests/casediac/casediac.txt index 4c0ec4a3..a9025d06 100644 --- a/tests/casediac/casediac.txt +++ b/tests/casediac/casediac.txt @@ -4,9 +4,9 @@ text/html [file:///home/dockes/projets/fulltext/testrecoll/casediac/testfile.htm + recollq -s french èviter 1 results text/html [file:///home/dockes/projets/fulltext/testrecoll/casediac/testfile.html] [testfile.html] 140 bytes -+ recollq -s french '"èviter"D' ++ recollq -s french "èviter"D 0 results -+ recollq -s french '"eviter"D' ++ recollq -s french "eviter"D 0 results + recollq -s french eviter 1 results @@ -29,5 +29,5 @@ text/html [file:///home/dockes/projets/fulltext/testrecoll/casediac/testfile.htm 2 results text/html [file:///home/dockes/projets/fulltext/testrecoll/casediac/testfile1.html] [testfile1.html] 132 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/casediac/testfile.html] [testfile.html] 140 bytes -+ recollq -s french '"Majusculesxx"C' ++ recollq -s french "Majusculesxx"C 0 results diff --git a/tests/dates/dates.sh b/tests/dates/dates.sh index 7a4f5d32..68e8afa5 100755 --- a/tests/dates/dates.sh +++ b/tests/dates/dates.sh @@ -14,7 +14,7 @@ recollq date:/2009 datetest # one result: 2008 file recollq date:2007-01-01/2010-02-09 datetest # 2 results : files from 10 and 11 march 2010 -recollq date:2010-03-10/P10D datetest +recollq -S mtime date:2010-03-10/P10D datetest # 0 result: no such term recollq date:2010-03-10/P10D datetestnotermsmatch ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/dir/dir.sh b/tests/dir/dir.sh new file mode 100755 index 00000000..1b9d8b21 --- /dev/null +++ b/tests/dir/dir.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +topdir=`dirname $0`/.. +. $topdir/shared.sh + +initvariables $0 +( + # Only + recollq filename:testdirfile dir:testrecoll/dir/d1 OR + dir:testrecoll/dir/d2 -dir:d2 + +) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout + +diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 + +checkresult diff --git a/tests/dir/dir.txt b/tests/dir/dir.txt new file mode 100644 index 00000000..6021c364 --- /dev/null +++ b/tests/dir/dir.txt @@ -0,0 +1,2 @@ +1 results +text/plain [file:///home/dockes/projets/fulltext/testrecoll/dir/d1/testdirfile.txt] [testdirfile.txt] 0 bytes diff --git a/tests/empty/empty.txt b/tests/empty/empty.txt index 44bcba99..dbc3778c 100644 --- a/tests/empty/empty.txt +++ b/tests/empty/empty.txt @@ -1,2 +1,2 @@ -1 results -application/x-fsdirectory [file:///home/dockes/projets/fulltext/testrecoll/emptyUniqueTerm] [emptyUniqueTerm] 512 bytes +1 results +application/x-fsdirectory [file:///home/dockes/projets/fulltext/testrecoll/emptyUniqueTerm] [emptyUniqueTerm] 4096 bytes diff --git a/tests/kar/kar.sh b/tests/kar/kar.sh index 84d7801b..2c8fea03 100755 --- a/tests/kar/kar.sh +++ b/tests/kar/kar.sh @@ -7,8 +7,8 @@ initvariables $0 export LC_ALL=en_US.UTF-8 ( - recollq '"Ночь и тишина, данная на век"' - recollq '"Man it’s a hot one"' + recollq -S mtime '"Ночь и тишина, данная на век"' + recollq -S mtime '"Man it’s a hot one"' ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/lyx/lyx.sh b/tests/lyx/lyx.sh index 143d57e1..4dfea548 100755 --- a/tests/lyx/lyx.sh +++ b/tests/lyx/lyx.sh @@ -6,9 +6,9 @@ topdir=`dirname $0`/.. initvariables $0 ( -recollq 'Bienvenue Dans Univers De Lyx' -recollq 'Welcome To Lyx' -recollq 'LyX jol dokumentalt' +recollq -S mtime 'Bienvenue Dans Univers De Lyx' +recollq -S mtime 'Welcome To Lyx' +recollq -S mtime 'LyX jol dokumentalt' ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt index dfff4844..2ce9b069 100644 --- a/tests/lyx/lyx.txt +++ b/tests/lyx/lyx.txt @@ -2,7 +2,7 @@ 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 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 +application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/splash.lyx] [splash.lyx] 2974 bytes 1 results application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/hu_splash.lyx] [hu_splash.lyx] 4773 bytes diff --git a/tests/notypes/notypes.txt b/tests/notypes/notypes.txt index 12de997a..fd0af40c 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 +inode/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 diff --git a/tests/tar/tar.sh b/tests/tar/tar.sh index 19109c83..2002f6b1 100755 --- a/tests/tar/tar.sh +++ b/tests/tar/tar.sh @@ -6,7 +6,7 @@ topdir=`dirname $0`/.. initvariables $0 ( - recollq TARUNIQUETERM2 + recollq -S mtime TARUNIQUETERM2 ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/tar/tar.txt b/tests/tar/tar.txt index b2bf94fd..780d1ba3 100644 --- a/tests/tar/tar.txt +++ b/tests/tar/tar.txt @@ -2,5 +2,5 @@ text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tar] [tarfile.tar] 15 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tar.gz] [tarfile.tar.gz] 15 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tgz] [tarfile.tgz] 15 bytes -text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tbz] [tarfile.tbz] 15 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tar.bz2] [tarfile.tar.bz2] 15 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/tar/tarfile.tbz] [tarfile.tbz] 15 bytes diff --git a/tests/txt/txt.sh b/tests/txt/txt.sh index 63629833..76b5aa1a 100755 --- a/tests/txt/txt.sh +++ b/tests/txt/txt.sh @@ -8,8 +8,8 @@ initvariables $0 # Should find the file where its unaccented and the other and also an instance # in misc.zip ( - recollq Anemometre - recollq embed_stylesheet filename:'docutils*' + recollq -S mtime Anemometre + recollq -S mtime embed_stylesheet filename:'docutils*' ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/txt/txt.txt b/tests/txt/txt.txt index 6447365c..fea813de 100644 --- a/tests/txt/txt.txt +++ b/tests/txt/txt.txt @@ -1,6 +1,6 @@ 3 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/txt/liste.txt] [liste.txt] 1182 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/txt/liste1.txt] [liste1.txt] 893 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/txt/liste.txt] [liste.txt] 1182 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 1181 bytes 1 results text/x-ini [file:///home/dockes/projets/fulltext/testrecoll/txt/docutils.ini] [docutils.ini] 177 bytes diff --git a/tests/xml/xml.sh b/tests/xml/xml.sh index 1c8fc162..5e000aa2 100755 --- a/tests/xml/xml.sh +++ b/tests/xml/xml.sh @@ -5,9 +5,9 @@ topdir=`dirname $0`/.. initvariables $0 ( -recollq xmlhuunique -recollq xmlzhuunique -recollq xmlzshuunique +recollq -S mtime xmlhuunique +recollq -S mtime xmlzhuunique +recollq -S mtime xmlzshuunique ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout