svn commit: r530767 - /spamassassin/trunk/t/SATest.pm

[jm...@apache.org]

Author: jm
Date: Fri Apr 20 05:29:25 2007
New Revision: 530767

URL: http://svn.apache.org/viewvc?view=rev&rev=530767
Log:
bug 4834: allow builders to call tests with 'make test SPAMD_HOST=[ipaddress]', to deal with FreeBSD jails which don't allow the tests to open TCP connections from a source address of 127.0.0.1

Modified:
    spamassassin/trunk/t/SATest.pm

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?view=diff&rev=530767&r1=530766&r2=530767
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Fri Apr 20 05:29:25 2007
@@ -63,7 +63,7 @@
   $salearn ||= "$perl_cmd ../sa-learn.raw";
 
   $spamdhost = $ENV{'SPAMD_HOST'};
-  $spamdhost ||= "localhost";
+  $spamdhost ||= "127.0.0.1";
   $spamdport = $ENV{'SPAMD_PORT'};
   $spamdport ||= probably_unused_spamd_port();
 
@@ -420,6 +420,11 @@
   if ($spamd_extra_args !~ /(?:-p\s*[0-9]+|-o|--socketpath)/) {
     push(@spamd_args,
       qq{-p}, $spamdport,
+    );
+  }
+  if ($spamd_extra_args !~ /(?:--socketpath)/) {
+    push(@spamd_args,
+      qq{-A}, $spamdhost,
     );
   }