Return-Path: Delivered-To: apmail-spamassassin-commits-archive@www.apache.org Received: (qmail 31895 invoked from network); 20 Apr 2007 12:29:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Apr 2007 12:29:47 -0000 Received: (qmail 67164 invoked by uid 500); 20 Apr 2007 12:29:53 -0000 Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org Received: (qmail 67145 invoked by uid 500); 20 Apr 2007 12:29:53 -0000 Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "SpamAssassin Dev" List-Id: Delivered-To: mailing list commits@spamassassin.apache.org Received: (qmail 67134 invoked by uid 99); 20 Apr 2007 12:29:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Apr 2007 05:29:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Apr 2007 05:29:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4A0C91A9838; Fri, 20 Apr 2007 05:29:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530767 - /spamassassin/trunk/t/SATest.pm Date: Fri, 20 Apr 2007 12:29:26 -0000 To: commits@spamassassin.apache.org From: jm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070420122926.4A0C91A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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, ); }