Switch to unified view

a/tests/runtests.sh b/tests/runtests.sh
...
...
5
    exit 1
5
    exit 1
6
fi
6
fi
7
7
8
. shared.sh
8
. shared.sh
9
9
10
if test ! x$reroot = x ; then
11
    rerootResults
12
fi
13
10
makeindex() {
14
makeindex() {
11
  echo "Zeroing Index" 
15
  echo "Zeroing Index" 
12
  rm -rf $RECOLL_CONFDIR/xapiandb $RECOLL_CONFDIR/aspdict.*.rws
16
  rm -rf $RECOLL_CONFDIR/xapiandb $RECOLL_CONFDIR/aspdict.*.rws
13
  echo "Indexing" 
17
  echo "Indexing" 
14
  recollindex -z
18
  recollindex -c $RECOLL_CONFDIR -z
15
}
19
}
20
16
if test x$noindex = x ; then
21
if test x$noindex = x ; then
17
makeindex
22
  makeindex
18
fi
23
fi
19
24
20
# Yes, we could/should use the $toptmp from shared.sh here, but what if
25
# Yes, we could/should use the $toptmp from shared.sh here, but what if
21
# this is unset ?
26
# this is unset ?
22
toptmp=${TMPDIR:-/tmp}/recolltsttmp
27
toptmp=${TMPDIR:-/tmp}/recolltsttmp
...
...
24
   rm -rf $toptmp/*
29
   rm -rf $toptmp/*
25
else
30
else
26
    mkdir $toptmp || fatal cant create temp dir $toptmp
31
    mkdir $toptmp || fatal cant create temp dir $toptmp
27
fi
32
fi
28
33
29
dirs=`ls -F | grep / | grep -v CVS | grep -v non-auto`
34
dirs=`ls -F | grep / | grep -v CVS | grep -v non-auto | grep -v config`
30
35
31
echo
36
echo
32
echo "Running query tests:"
37
echo "Running query tests:"
33
38
34
for dir in $dirs ; do
39
for dir in $dirs ; do
35
    cd $dir && echo -n "$dir "
40
    cd $dir && $ECHON "$dir "
36
    sh `basename $dir`.sh
41
    sh `basename $dir`.sh
37
    cd ..
42
    cd ..
38
done
43
done
39
44
40
echo
45
echo