spamassassin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j.@apache.org
Subject svn commit: r588291 - /spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver
Date Thu, 25 Oct 2007 17:40:26 GMT
Author: jm
Date: Thu Oct 25 10:40:26 2007
New Revision: 588291

URL: http://svn.apache.org/viewvc?rev=588291&view=rev
Log:
log commands run

Modified:
    spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver

Modified: spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver?rev=588291&r1=588290&r2=588291&view=diff
==============================================================================
--- spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver
(original)
+++ spamassassin/branches/bug-5293-pluginized-bayes/masses/bayes-testing/bayes-10pcv-driver
Thu Oct 25 10:40:26 2007
@@ -77,6 +77,10 @@
   echo "Restoring full learned DBs..."
   ( cd $tmpdir; rm -rf dbs; tar xf learned-all.tar )
 }
+runcmd () {
+  echo "$*"
+  time $*
+}
 
 if [ $LEARN_ALL_THEN_FORGET_TEST_SET = 1 ] ; then
 
@@ -88,14 +92,14 @@
 
   (
   echo -n "Learning from all ham buckets..." ; date
-  time sa-learn --ham --randseed=1 --no-sync $learnargs \
+  runcmd sa-learn --ham --randseed=1 --no-sync $learnargs \
 	  --showdots --mbox --config-file=$tmpdir/rules $testdir/cor/ham/*
 
   echo -n "Learning from all spam buckets..." ; date
-  time sa-learn --spam --randseed=1 --no-sync $learnargs \
+  runcmd sa-learn --spam --randseed=1 --no-sync $learnargs \
 	  --showdots --mbox --config-file=$tmpdir/rules $testdir/cor/spam/*
 
-  time sa-learn --sync $learnargs --config-file=$tmpdir/rules
+  runcmd sa-learn --sync $learnargs --config-file=$tmpdir/rules
 
   echo -n "Done learning. " ; date
   ) 2>&1 | tee $results/learn.log
@@ -141,30 +145,30 @@
 
   if [ $LEARN_ALL_THEN_FORGET_TEST_SET = 1 ] ; then
     echo "Forgetting contents of test ham bucket..."
-    time sa-learn --forget --config-file=$tmpdir/rules --showdots \
+    runcmd sa-learn --forget --config-file=$tmpdir/rules --showdots \
 			  --mbox $rdir/hbuckettest
 
     echo "Forgetting contents of test spam bucket..."
-    time sa-learn --forget --config-file=$tmpdir/rules --showdots \
+    runcmd sa-learn --forget --config-file=$tmpdir/rules --showdots \
 			  --mbox $rdir/sbuckettest
 
   else
     echo "Learning contents of learn ham bucket..."
-    time sa-learn --ham --randseed=1 --no-sync $learnargs \
+    runcmd sa-learn --ham --randseed=1 --no-sync $learnargs \
 	    --showdots --mbox --config-file=$tmpdir/rules $rdir/hbucketlearn
 
     echo "Learning contents of learn spam bucket..."
-    time sa-learn --spam --randseed=1 --no-sync $learnargs \
+    runcmd sa-learn --spam --randseed=1 --no-sync $learnargs \
 	    --showdots --mbox --config-file=$tmpdir/rules $rdir/sbucketlearn
 
-    time sa-learn --sync $learnargs --config-file=$tmpdir/rules
+    runcmd sa-learn --sync $learnargs --config-file=$tmpdir/rules
 
     echo "Dumping bayes DB..."
     ( cd .. ; sa-learn --dump --dbpath=$tmpdir/dbs/bayes ) \
 	  > $rdir/bayes_db.dump
   fi
 
-  time sa-learn --sync --config-file=$tmpdir/rules
+  runcmd sa-learn --sync --config-file=$tmpdir/rules
 
   # take a copy of the trained Bayes DBs, gzipped
   ( cd $tmpdir ; tar cf - dbs | gzip -c > $rdir/dbs.tgz )
@@ -199,12 +203,12 @@
 
   else
     echo "Running mass-check on ham bucket..."
-    time ./mass-check -c=$tmpdir/rules -p=$tmpdir/rules --showdots \
+    runcmd ./mass-check -c=$tmpdir/rules -p=$tmpdir/rules --showdots \
 	  --bayes --mbox $rdir/hbuckettest \
 	  > $rdir/nonspam.log
 
     echo "Running mass-check on spam bucket..."
-    time ./mass-check -c=$tmpdir/rules -p=$tmpdir/rules --showdots \
+    runcmd ./mass-check -c=$tmpdir/rules -p=$tmpdir/rules --showdots \
 	  --bayes --mbox $rdir/sbuckettest \
 	  > $rdir/spam.log
   fi



Mime
View raw message