Mailing List Archive

Author: sidney
Date: Sun Mar 17 20:46:54 2024
New Revision: 1916374

URL: http://svn.apache.org/viewvc?rev=1916374&view=rev
Log:
bug 8229 - remove run_sql_pref_tests config option, run if possible

Modified:
spamassassin/trunk/t/config.dist
spamassassin/trunk/t/spamd_sql_prefs.t

Modified: spamassassin/trunk/t/config.dist
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/config.dist?rev=1916374&r1=1916373&r2=1916374&view=diff
==============================================================================
--- spamassassin/trunk/t/config.dist (original)
+++ spamassassin/trunk/t/config.dist Sun Mar 17 20:46:54 2024
@@ -21,11 +21,7 @@ run_ipv6_dns_tests=n
run_dcc_tests=n

# ---------------------------------------------------------------------------
-# Run SQL-based user pref tests during 'make test' REQUIRES DBD::SQLite 1.59_01 or later
-run_sql_pref_tests=n
-
-# ---------------------------------------------------------------------------
-# Run SQL-based Auto-whitelist tests during 'make test'
+# Run SQL-based Auto-welcomelist tests during 'make test'
# NOTE: AWL test is always run with DBD::SQLite when available, only enable
# this when you want to additionally test for example MySQL or PostgresSQL
# (for which database needs to be created manually and configured below).

Modified: spamassassin/trunk/t/spamd_sql_prefs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_sql_prefs.t?rev=1916374&r1=1916373&r2=1916374&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_sql_prefs.t (original)
+++ spamassassin/trunk/t/spamd_sql_prefs.t Sun Mar 17 20:46:54 2024
@@ -7,7 +7,6 @@ use constant HAS_DBD_SQLITE => eval { re

use Test::More;
plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
-plan skip_all => "SQL Pref tests disabled" unless conf_bool('run_sql_pref_tests');
plan skip_all => "DBI is unavailble" unless HAS_DBI;
plan skip_all => "SQLite is unavailble" unless HAS_DBD_SQLITE;
plan tests => 32;