--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -7,14 +7,19 @@
. shared.sh
+if test ! x$reroot = x ; then
+ rerootResults
+fi
+
makeindex() {
echo "Zeroing Index"
rm -rf $RECOLL_CONFDIR/xapiandb $RECOLL_CONFDIR/aspdict.*.rws
echo "Indexing"
- recollindex -z
+ recollindex -c $RECOLL_CONFDIR -z
}
+
if test x$noindex = x ; then
-makeindex
+ makeindex
fi
# Yes, we could/should use the $toptmp from shared.sh here, but what if
@@ -26,13 +31,13 @@
mkdir $toptmp || fatal cant create temp dir $toptmp
fi
-dirs=`ls -F | grep / | grep -v CVS | grep -v non-auto`
+dirs=`ls -F | grep / | grep -v CVS | grep -v non-auto | grep -v config`
echo
echo "Running query tests:"
for dir in $dirs ; do
- cd $dir && echo -n "$dir "
+ cd $dir && $ECHON "$dir "
sh `basename $dir`.sh
cd ..
done