You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2014/02/12 18:30:36 UTC

svn commit: r1567693 - in /spamassassin/trunk/t: README SATest.pm

Author: mmartinec
Date: Wed Feb 12 17:30:35 2014
New Revision: 1567693

URL: http://svn.apache.org/r1567693
Log:
Bug 7004 - Test suite fails when using FreeBSD's 'script' utility

Modified:
    spamassassin/trunk/t/README
    spamassassin/trunk/t/SATest.pm

Modified: spamassassin/trunk/t/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/README?rev=1567693&r1=1567692&r2=1567693&view=diff
==============================================================================
--- spamassassin/trunk/t/README (original)
+++ spamassassin/trunk/t/README Wed Feb 12 17:30:35 2014
@@ -80,7 +80,7 @@ values.
 SPAMD_HOST
 SPAMD_PORT
 SPAMD_LOCALHOST
-SCRIPT
+SPAMASSASSIN_SCRIPT
 SPAMC_SCRIPT
 SALEARN_SCRIPT
 SA_ARGS

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=1567693&r1=1567692&r2=1567693&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Wed Feb 12 17:30:35 2014
@@ -90,7 +90,7 @@ sub sa_t_init {
   $perl_cmd .= " -T" if !defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAINT'} ne 'no';
   $perl_cmd .= " -w" if !defined($ENV{'TEST_PERL_WARN'})  or $ENV{'TEST_PERL_WARN'}  ne 'no';
 
-  $scr = $ENV{'SCRIPT'};
+  $scr = $ENV{'SPAMASSASSIN_SCRIPT'};
   $scr ||= "$perl_cmd ../spamassassin.raw";
 
   $spamd = "$perl_cmd ../spamd/spamd.raw";