spamassassin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From par...@apache.org
Subject svn commit: r171358 - in /spamassassin/trunk/t: SATest.pm data/spamc_blank.cf
Date Sun, 22 May 2005 19:00:35 GMT
Author: parker
Date: Sun May 22 12:00:34 2005
New Revision: 171358

URL: http://svn.apache.org/viewcvs?rev=171358&view=rev
Log:
Point normal spamc tests at a blank config file to avoid picking up any from a system config
file

Added:
    spamassassin/trunk/t/data/spamc_blank.cf
Modified:
    spamassassin/trunk/t/SATest.pm

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/SATest.pm?rev=171358&r1=171357&r2=171358&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Sun May 22 12:00:34 2005
@@ -292,12 +292,16 @@
   my $spamcargs;
   if($args !~ /\b(?:-p\s*[0-9]+|-F|-U)\b/)
   {
-    $spamcargs = "$spamc -d $spamdhost -p $spamdport $args";
+    $args = "-d $spamdhost -p $spamdport $args";
   }
-  else
-  {
+
+  if ($args !~ /-F/) {
+    $spamcargs = "$spamc -F data/spamc_blank.cf $args";
+  }
+  else {
     $spamcargs = "$spamc $args";
   }
+
   $spamcargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);
 
   print ("\t$spamcargs\n");

Added: spamassassin/trunk/t/data/spamc_blank.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/data/spamc_blank.cf?rev=171358&view=auto
==============================================================================
    (empty)



Mime
View raw message