svn commit: rev 6927 - incubator/spamassassin/trunk/masses/rule-qa

[qu...@apache.org]

Author: quinlan
Date: Sat Feb 28 18:08:47 2004
New Revision: 6927

Modified:
   incubator/spamassassin/trunk/masses/rule-qa/README.nightly
   incubator/spamassassin/trunk/masses/rule-qa/corpus-hourly
   incubator/spamassassin/trunk/masses/rule-qa/corpus-nightly
Log:
some updates and fixes


Modified: incubator/spamassassin/trunk/masses/rule-qa/README.nightly
==============================================================================
--- incubator/spamassassin/trunk/masses/rule-qa/README.nightly	(original)
+++ incubator/spamassassin/trunk/masses/rule-qa/README.nightly	Sat Feb 28 18:08:47 2004
@@ -15,17 +15,34 @@
    $HOME/cvs/spamassassin        - the tree (checked out with the correct tag)
    $HOME/cvs/spamassassin/corpus - the corpus description (for "mass-check -f")
 
- - $HOME/.corpus contains various settings as described in the scripts
+ - $HOME/.corpus contains various settings:
 
-------- start of cut text --------------
-corpus=/home/corpus/corpus
-html=/home/html/root/users/corpus
-tagtime=/home/corpus/log/tagtime
-tmp=/home/corpus/tmp
-tree=/home/corpus/cvs/spamassassin
-username=joe
-password=xyzzy
-------- end ----------------------------
+   # location of corpus file (mass-check -f $corpus)
+   corpus=/home/corpus/corpus
+
+   # location for summary results
+   html=/home/html/root/users/corpus
+
+   # location of tagtime file
+   tagtime=/home/corpus/log/tagtime
+
+   # temporary working directory for summary results
+   tmp=/home/corpus/tmp
+
+   # subversion directory location
+   tree=/home/corpus/svn/spamassassin
+
+   # rsync username and password
+   username=joe
+   password=xyzzy
+
+   # weekly and nightly mass-check options
+   opts_weekly=--restart=500 --tail=15000 --net -j 8
+   opts_nightly=--restart=500 --tail=15000 --net -j 8
+
+   # weekly and nightly mass-check user_prefs files
+   prefs_weekly=/home/corpus/corpus/user_prefs.weekly
+   prefs_nightly=/home/corpus/corpus/user_prefs.nightly
 
  - the following cron job (hours for tagtime and corpus-nightly for your
    local time, this is US/Pacific)

Modified: incubator/spamassassin/trunk/masses/rule-qa/corpus-hourly
==============================================================================
--- incubator/spamassassin/trunk/masses/rule-qa/corpus-hourly	(original)
+++ incubator/spamassassin/trunk/masses/rule-qa/corpus-hourly	Sat Feb 28 18:08:47 2004
@@ -1,14 +1,6 @@
 #!/usr/bin/perl -w
 
-# $HOME/.corpus should contain settings for these values:
-#
-# corpus=/home/corpus/corpus
-# tree=/home/corpus/svn/spamassassin
-# tmp=/home/corpus/tmp
-# tagtime=/home/corpus/log/tagtime
-# html=/home/html/root/users/corpus
-# username=joe
-# password=xyzzy
+# settings are located in $HOME/.corpus
 
 use strict;
 use POSIX qw(nice);
@@ -49,7 +41,7 @@
     while(<C>) {
 	chomp;
 	s/#.*//;
-	if (/^(.*?)\s*=\s*(.*)/) {
+	if (/^\s*(.*?)\s*=\s*(.*?)\s*/) {
 	    $opt{$1} = $2;
 	}
     }

Modified: incubator/spamassassin/trunk/masses/rule-qa/corpus-nightly
==============================================================================
--- incubator/spamassassin/trunk/masses/rule-qa/corpus-nightly	(original)
+++ incubator/spamassassin/trunk/masses/rule-qa/corpus-nightly	Sat Feb 28 18:08:47 2004
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-# $HOME/.corpus should contain settings for these values:
-#
-# tree=/home/corpus/svn/spamassassin
-# username=joe
-# password=xyzzy
+# settings are located in $HOME/.corpus
 
 . $HOME/.corpus
 
@@ -59,14 +55,23 @@
 
 # run test
 cd masses
+rm -f spamassassin/auto*
 rm -f spamassassin/bayes*
 rm -f razor-agent.log
 date > test.start
 if [ -n "$net" ]; then
-	./mass-check --net -j 8 -f /home/corpus/mail/corpus
+	prefs=$prefs_weekly
+	opts=$opts_weekly
 else
-	./mass-check -f /home/corpus/mail/corpus
+	prefs=$prefs_nightly
+	opts=$opts_nightly
 fi
+if [ -n "$prefs" -a -f "$prefs" ]; then
+	cp $prefs spamassassin/user_prefs
+else
+	rm -f spamassassin/user_prefs
+fi
+./mass-check $opts -f $corpus
 uptime
 date > test.end