Return-Path: 
 <commits-return-5106-apmail-spamassassin-commits-archive=spamassassin.apache.org@spamassassin.apache.org>
Delivered-To: apmail-spamassassin-commits-archive@www.apache.org
Received: (qmail 84422 invoked from network); 3 May 2005 06:53:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 3 May 2005 06:53:28 -0000
Received: (qmail 69539 invoked by uid 500); 3 May 2005 06:55:04 -0000
Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org
Received: (qmail 69477 invoked by uid 500); 3 May 2005 06:55:03 -0000
Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:commits-help@spamassassin.apache.org>
list-unsubscribe: <mailto:commits-unsubscribe@spamassassin.apache.org>
List-Post: <mailto:commits@spamassassin.apache.org>
Reply-To: "SpamAssassin Dev" <dev@spamassassin.apache.org>
List-Id: <commits.spamassassin.apache.org>
Delivered-To: mailing list commits@spamassassin.apache.org
Received: (qmail 69409 invoked by uid 99); 3 May 2005 06:55:01 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 02 May 2005 23:54:59 -0700
Received: (qmail 84356 invoked by uid 65534); 3 May 2005 06:53:19 -0000
Message-ID: <20050503065319.84355.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r167871 - in /spamassassin/trunk:
 masses/parse-rules-for-masses
 t/meta.t
Date: Tue, 03 May 2005 06:53:19 -0000
To: commits@spamassassin.apache.org
From: parker@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: parker
Date: Mon May  2 23:53:18 2005
New Revision: 167871

URL: http://svn.apache.org/viewcvs?rev=3D167871&view=3Drev
Log:
Ignore test rules when running meta.t tests

Modified:
    spamassassin/trunk/masses/parse-rules-for-masses
    spamassassin/trunk/t/meta.t

Modified: spamassassin/trunk/masses/parse-rules-for-masses
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/parse-rules-fo=
r-masses?rev=3D167871&r1=3D167870&r2=3D167871&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- spamassassin/trunk/masses/parse-rules-for-masses (original)
+++ spamassassin/trunk/masses/parse-rules-for-masses Mon May  2 23:53:18 20=
05
@@ -23,23 +23,24 @@
 parse-rules-for-masses: parse the SpamAssassin rules files for mass-checks,
         evolving, and frequency analysis
=20
-usage: ./parse-rules-for-masses [-d rulesdir] [-o outputfile] [-s scoreset]
+usage: ./parse-rules-for-masses [-d rulesdir] [-o outputfile] [-s scoreset=
] [-x]
=20
 rulesdir defaults to ../rules
 outputfile defaults to ./tmp/rules.pl
 scoreset default to 0
-
+-x do not include test rules files (ie 70_*)
 ";
 }
=20
 use Getopt::Long;
 use Data::Dumper;
=20
-use vars qw(@rulesdirs $outputfile $scoreset);
+use vars qw(@rulesdirs $outputfile $scoreset $skip_test_rules);
 GetOptions (
                 "d=3Ds" =3D> \@rulesdirs,
                 "o=3Ds" =3D> \$outputfile,
 		"s=3Di" =3D> \$scoreset,
+	        "x" =3D> \$skip_test_rules,
                 "help|h|?" =3D> sub { usage(); } );
=20
 if ($#rulesdirs < 0) {
@@ -74,6 +75,9 @@
     my %rulesfound =3D ();
     my %langs =3D ();
     foreach $file (sort @files) {
+      if ($skip_test_rules) {
+	next if ($file =3D~ /7\d_/);
+      }
       open (IN, "<$file");
       while (<IN>)
       {

Modified: spamassassin/trunk/t/meta.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/meta.t?rev=3D167871=
&r1=3D167870&r2=3D167871&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- spamassassin/trunk/t/meta.t (original)
+++ spamassassin/trunk/t/meta.t Mon May  2 23:53:18 2005
@@ -38,7 +38,7 @@
   unlink $output || die;
   %rules =3D ();
   %scores =3D ();
-  if (system("$prefix/masses/parse-rules-for-masses -o $output -d \"$prefi=
x/rules\" -s $scoreset")) {
+  if (system("$prefix/masses/parse-rules-for-masses -o $output -d \"$prefi=
x/rules\" -s $scoreset -x")) {
     warn "parse-rules-for-masses failed!";
   }
   eval {