Mailing List Archive

svn commit: rev 6634 - incubator/spamassassin/trunk/t
Author: mss
Date: Thu Feb 12 05:40:07 2004
New Revision: 6634

Modified:
incubator/spamassassin/trunk/t/bayesdbm.t
incubator/spamassassin/trunk/t/bayessql.t
Log:
bug 3022: Applied Michael Parker's patch to skip the DBI/DB_File tests on platforms where they're not supported.


Modified: incubator/spamassassin/trunk/t/bayesdbm.t
==============================================================================
--- incubator/spamassassin/trunk/t/bayesdbm.t (original)
+++ incubator/spamassassin/trunk/t/bayesdbm.t Thu Feb 12 05:40:07 2004
@@ -5,6 +5,8 @@
use SATest; sa_t_init("bayes");
use Test;

+use constant HAS_DB_FILE => eval { require DB_File; };
+
BEGIN {
if (-e 't/test_dir') {
chdir 't';
@@ -14,8 +16,10 @@
unshift(@INC, '../blib/lib');
}

- plan tests => 43
+ plan tests => (HAS_DB_FILE ? 43 : 0);
};
+
+exit unless HAS_DB_FILE;

tstlocalrules ("
bayes_learn_to_journal 0

Modified: incubator/spamassassin/trunk/t/bayessql.t
==============================================================================
--- incubator/spamassassin/trunk/t/bayessql.t (original)
+++ incubator/spamassassin/trunk/t/bayessql.t Thu Feb 12 05:40:07 2004
@@ -3,9 +3,9 @@
use lib '.'; use lib 't';
use SATest;
use Test;
-use DBI; # for our cleanup stuff

use constant TEST_ENABLED => (-e 'bayessql.cf' || -e 't/bayessql.cf');
+use constant HAS_DBI => eval { require DBI; }; # for our cleanup stuff

BEGIN {
if (-e 't/test_dir') {
@@ -16,7 +16,7 @@
unshift(@INC, '../blib/lib');
}

- plan tests => (TEST_ENABLED ? 38 : 0);
+ plan tests => ((TEST_ENABLED && HAS_DBI) ? 38 : 0);

onfail => sub {
warn "\n\nNote: Failure may be due to an incorrect config.";