You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/04/20 22:16:27 UTC
svn commit: r530907 - in /spamassassin/trunk/t: check_implemented.t
saw_ampersand.t
Author: jm
Date: Fri Apr 20 13:16:26 2007
New Revision: 530907
URL: http://svn.apache.org/viewvc?view=rev&rev=530907
Log:
replace unportable perl command with workalike, but win32-portable, code in tests
Modified:
spamassassin/trunk/t/check_implemented.t
spamassassin/trunk/t/saw_ampersand.t
Modified: spamassassin/trunk/t/check_implemented.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/check_implemented.t?view=diff&rev=530907&r1=530906&r2=530907
==============================================================================
--- spamassassin/trunk/t/check_implemented.t (original)
+++ spamassassin/trunk/t/check_implemented.t Fri Apr 20 13:16:26 2007
@@ -33,11 +33,20 @@
use strict;
require Mail::SpamAssassin;
-# TODO: unportable
-system "perl -pi.bak -e 's/^loadplugin/###loadplugin/g' ".
- " log/localrules.tmp/*.pre log/test_rules_copy/*.pre";
-
-($? >> 8 != 0) and die "perl failed";
+# kill all 'loadplugin' lines
+foreach my $file
+ (<log/localrules.tmp/*.pre>, <log/test_rules_copy/*.pre>) #*/
+{
+ rename $file, "$file.bak" or die "rename $file failed";
+ open IN, "<$file.bak" or die "cannot read $file.bak";
+ open OUT, ">$file" or die "cannot write $file";
+ while (<IN>) {
+ s/^loadplugin/###loadplugin/g;
+ print OUT;
+ }
+ close IN;
+ close OUT;
+}
my $sa = create_saobj({
'dont_copy_prefs' => 1,
Modified: spamassassin/trunk/t/saw_ampersand.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/saw_ampersand.t?view=diff&rev=530907&r1=530906&r2=530907
==============================================================================
--- spamassassin/trunk/t/saw_ampersand.t (original)
+++ spamassassin/trunk/t/saw_ampersand.t Fri Apr 20 13:16:26 2007
@@ -47,11 +47,22 @@
print "\ntrying net with only local rule plugins\n";
-# TODO: unportable
-system "perl -pi.bak -e 's/^loadplugin/###loadplugin/g' ".
- " log/localrules.tmp/*.pre log/test_rules_copy/*.pre";
-($? >> 8 != 0) and die "perl failed";
+# kill all 'loadplugin' lines
+foreach my $file
+ (<log/localrules.tmp/*.pre>, <log/test_rules_copy/*.pre>) #*/
+{
+ rename $file, "$file.bak" or die "rename $file failed";
+ open IN, "<$file.bak" or die "cannot read $file.bak";
+ open OUT, ">$file" or die "cannot write $file";
+ while (<IN>) {
+ s/^loadplugin/###loadplugin/g;
+ print OUT;
+ }
+ close IN;
+ close OUT;
+}
+
my $plugins = q{
loadplugin Mail::SpamAssassin::Plugin::Check