svn commit: r610991 - /spamassassin/trunk/masses/rule-qa/corpus-hourly

[jm...@apache.org]

Author: jm
Date: Thu Jan 10 15:59:52 2008
New Revision: 610991

URL: http://svn.apache.org/viewvc?rev=610991&view=rev
Log:
bug 5772: use a checkout of the correct revision when building hit-frequencies reports, so that zero-hitting rules are correctly reported in ruleQA output

Modified:
    spamassassin/trunk/masses/rule-qa/corpus-hourly

Modified: spamassassin/trunk/masses/rule-qa/corpus-hourly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/corpus-hourly?rev=610991&r1=610990&r2=610991&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus-hourly (original)
+++ spamassassin/trunk/masses/rule-qa/corpus-hourly Thu Jan 10 15:59:52 2008
@@ -603,18 +603,24 @@
   my ($rev, $args) = @_;
 
   $rev ||= 'HEAD';
-  print "setting up hit-frequencies for r$rev\n";
+  my $hfdir = "$opt{tmp}/hfdir/r$rev";
 
-  (-d "$opt{tmp}/hfdir") or system("mkdir $opt{tmp}/hfdir");
+  print "setting up hit-frequencies for r$rev in $hfdir\n";
 
-  my $hfdir = "$opt{tmp}/hfdir/r$rev";
+  (-d "$opt{tmp}/hfdir") or system("mkdir $opt{tmp}/hfdir");
   if (!-d $hfdir) {
     system ("cp -pr $opt{tree} $hfdir");
     ($?>>8 != 0) and die "cp $opt{tree}/masses $hfdir failed";
   }
 
   chdir "$hfdir" or die "cannot chdir $hfdir";
-  system("svn up -r$rev && make");
+  system("svn up -r$rev; svn up -r$rev rulesrc");
+
+  # ensure these are rebuilt
+  system("rm -f rules/70_sandbox.cf rules/72_active.cf");
+
+  # do this twice in case Makefile.PL is rebuilt
+  system ("( make build_rules; make build_rules ) < /dev/null");
 
   chdir "$hfdir/masses" or die "cannot chdir $hfdir/masses";
   open (FREQS, "./hit-frequencies -TxpaP $args |")