Mailing List Archive

Author: jm
Date: Mon Dec 11 03:58:56 2006
New Revision: 485627

URL: http://svn.apache.org/viewvc?view=rev&rev=485627
Log:
ensure base strings are sorted, to fix test failures from differing orders on perl 5.6.x and 5.8.x

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
spamassassin/trunk/t/re_base_extraction.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm?view=diff&rev=485627&r1=485626&r2=485627
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm Mon Dec 11 03:58:56 2006
@@ -261,7 +261,7 @@

foreach my $set (@good_bases) {
my $base = $set->{base};
- my $key = $set->{name};
+ my $key = join ' ', sort split (' ', $set->{name});
next unless $base;
$conf->{base_string}->{$ruletype}->{$base} = $key;
}

Modified: spamassassin/trunk/t/re_base_extraction.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/re_base_extraction.t?view=diff&rev=485627&r1=485626&r2=485627
==============================================================================
--- spamassassin/trunk/t/re_base_extraction.t (original)
+++ spamassassin/trunk/t/re_base_extraction.t Mon Dec 11 03:58:56 2006
@@ -43,15 +43,15 @@
}, [

'fo bar:TEST1B',
- 'foo bar:TEST1 TEST1B TEST1A FOO',
+ 'foo bar:FOO TEST1 TEST1A TEST1B',
'to be removed from:EXCUSE_REMOVE',
'nslt:KAM_STOCKTIP15',
'nano superlattice technology:KAM_STOCKTIP15',
- 'fooish bar:TEST1 TEST1B TEST1A',
+ 'fooish bar:TEST1 TEST1A TEST1B',
'act now:TEST4',
'food:TEST2',
- 'food bar:TEST3 TEST2',
- 'foody bar:TEST3 TEST2',
+ 'food bar:TEST2 TEST3',
+ 'foody bar:TEST2 TEST3',
'refinanc:TEST5',
'time to refinance:TEST5',
'target:TEST6',