[cvs] bogofilter/src/tests t.regtest,1.4,1.5 t.robx,1.4,1.5 t.split,1.2,1.3

[<re...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv20717/src/tests

Modified Files:
	t.regtest t.robx t.split 
Log Message:
Cleanup test options.

Index: t.regtest
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/tests/t.regtest,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- t.regtest	19 Sep 2003 12:59:07 -0000	1.4
+++ t.regtest	30 Sep 2003 22:55:34 -0000	1.5
@@ -23,6 +23,7 @@
 INPUT="${srcdir}/inputs"
 
 #opts="-x rw -vvvv"
+OPTS="-C -y 0"
 
 check_counts()
 {
@@ -59,8 +60,8 @@
 S=33	# expected tokens from spam message
 G=36	# expected tokens from good message
 
-$BOGOFILTER $opts -C -y 0 -s -I $INPUT/msg.regtest.s
-$BOGOFILTER $opts -C -y 0 -n -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -s -I $INPUT/msg.regtest.s
+$BOGOFILTER $OPTS -n -I $INPUT/msg.regtest.n
 
 check_counts
 
@@ -70,7 +71,7 @@
 S=33	# expected tokens from spam message
 G=0	# expected tokens from good message
 
-$BOGOFILTER $opts -C -y 0 -N -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -N -I $INPUT/msg.regtest.n
 
 check_counts
 
@@ -78,7 +79,7 @@
 S=61	# expected tokens from spam message
 G=0	# expected tokens from good message
 
-$BOGOFILTER $opts -C -y 0 -s -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -s -I $INPUT/msg.regtest.n
 
 check_counts
 
@@ -90,9 +91,9 @@
 
 rm -f $BOGOFILTER_DIR/*.${DB_EXT}
 
-$BOGOFILTER $opts -C -y 0 -s -I $INPUT/msg.regtest.s
-$BOGOFILTER $opts -C -y 0 -n -I $INPUT/msg.regtest.n
-$BOGOFILTER $opts -C -y 0 -Ns -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -s -I $INPUT/msg.regtest.s
+$BOGOFILTER $OPTS -n -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -Ns -I $INPUT/msg.regtest.n
 
 check_counts
 
@@ -104,8 +105,8 @@
 
 rm -f $BOGOFILTER_DIR/*.${DB_EXT}
 
-$BOGOFILTER $opts -C -y 0 -s -I $INPUT/msg.regtest.s
-$BOGOFILTER $opts -C -y 0 -n -I $INPUT/msg.regtest.n
-$BOGOFILTER $opts -C -y 0 -Sn -I $INPUT/msg.regtest.s
+$BOGOFILTER $OPTS -s -I $INPUT/msg.regtest.s
+$BOGOFILTER $OPTS -n -I $INPUT/msg.regtest.n
+$BOGOFILTER $OPTS -Sn -I $INPUT/msg.regtest.s
 
 check_counts

Index: t.robx
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/tests/t.robx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- t.robx	20 Sep 2003 02:30:58 -0000	1.4
+++ t.robx	30 Sep 2003 22:55:34 -0000	1.5
@@ -26,7 +26,7 @@
 stats_in_header=Y
 EOF
 
-OPTS=" -c ${CONFIG} -y 0"
+OPTS="-c ${CONFIG} -y 0"
 
 $BOGOFILTER $OPTS -r -s < ${SYSTEST}/inputs/spam.mbx
 $BOGOFILTER $OPTS -r -n < ${SYSTEST}/inputs/good.mbx

Index: t.split
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/tests/t.split,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t.split	20 Sep 2003 02:30:58 -0000	1.2
+++ t.split	30 Sep 2003 22:55:34 -0000	1.3
@@ -26,8 +26,8 @@
     )
 }
 
-$BOGOFILTER -f -s -C < ${srcdir}/inputs/spam.mbx
-$BOGOFILTER -f -n -C < ${srcdir}/inputs/good.mbx
+$BOGOFILTER -C -s < ${srcdir}/inputs/spam.mbx
+$BOGOFILTER -C -n < ${srcdir}/inputs/good.mbx
 
 OUT="split.out"
 
@@ -36,7 +36,7 @@
     nam=`basename $msg`
     out="$TMPDIR/$nam"
     map_rc $BOGOLEXER -C -p $v -I $msg > $out.l
-    map_rc $BOGOFILTER -vvv -f -C -I $msg > $out.f
+    map_rc $BOGOFILTER -C -vvv -I $msg > $out.f
     printf "%-24s %s\n" $nam `head -1 $out.f | sed s@spamicity=@@ \
     | tr -d "," | $AWK '{print $4}'` >> ${TMPDIR}/$OUT
 done