You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by km...@apache.org on 2013/01/17 02:51:13 UTC

svn commit: r1434534 - /spamassassin/trunk/t/whitelist_addrs.t

Author: kmcgrail
Date: Thu Jan 17 01:51:13 2013
New Revision: 1434534

URL: http://svn.apache.org/viewvc?rev=1434534&view=rev
Log:
Changes for t/whitelist_addrs.t to check for DB_File - bug 6884

Modified:
    spamassassin/trunk/t/whitelist_addrs.t

Modified: spamassassin/trunk/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_addrs.t?rev=1434534&r1=1434533&r2=1434534&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_addrs.t (original)
+++ spamassassin/trunk/t/whitelist_addrs.t Thu Jan 17 01:51:13 2013
@@ -4,8 +4,14 @@ use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_addrs");
 use IO::File;
 
+use constant HAS_MODULES => eval {
+  require DB_File;
+};
+
 use constant TEST_ENABLED => conf_bool('run_long_tests');
 
+use constant DO_RUN => TEST_ENABLED && HAS_MODULES;
+
 use Test;
 BEGIN { 
   if (-e 't/test_dir') {
@@ -16,10 +22,10 @@ BEGIN { 
     unshift(@INC, '../blib/lib');
   }
 
-  plan tests => (TEST_ENABLED ? 35 : 0);
+  plan tests => (DO_RUN ? 35 : 0);
  };
 
-exit unless TEST_ENABLED;
+exit unless DO_RUN;
 
 # ---------------------------------------------------------------------------