svn commit: rev 54130 - in spamassassin/trunk: lib/Mail/SpamAssassin t

[jm...@apache.org]

Author: jm
Date: Fri Oct  8 16:19:54 2004
New Revision: 54130

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
   spamassassin/trunk/t/rule_tests.t
Log:
bug 3887: don't record regression test strings unless run from t/rule_tests.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm	Fri Oct  8 16:19:54 2004
@@ -122,6 +122,9 @@
 $MISSING_REQUIRED_VALUE     = -998;
 $INVALID_VALUE              = -999;
 
+# set to "1" by the test suite code, to record regression tests
+# $Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS = 1;
+
 # search for "sub new {" to find the start of the code
 ###########################################################################
 
@@ -2441,6 +2444,7 @@
     setting => 'test',
     is_admin => 1,
     code => sub {
+      return unless defined($Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS);
       my ($self, $key, $value, $line) = @_;
       if ($value !~ /^(\S+)\s+(ok|fail)\s+(.*)$/) { return $INVALID_VALUE; }
       $self->{parser}->add_regression_test($1, $2, $3);

Modified: spamassassin/trunk/t/rule_tests.t
==============================================================================
--- spamassassin/trunk/t/rule_tests.t	(original)
+++ spamassassin/trunk/t/rule_tests.t	Fri Oct  8 16:19:54 2004
@@ -22,6 +22,8 @@
 
 $num_tests = 1;
 
+$Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS = 1;
+
 my $sa = Mail::SpamAssassin->new({
     rules_filename => "$prefix/t/log/test_rules_copy",
     site_rules_filename => "$prefix/t/log/test_default.cf",