[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/

["Sam James" <sam@gentoo.org>]

commit:     3325b59726a4c506370d927d7938a6d0317be178
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 15:51:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 15:58:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3325b597

mail-filter/spamassassin: drop test which needs dev-perl/DBD conditionally

t/sql_based_whitelist.t needs dev-perl/DBD which is only pulled in with
USE=sqlite/mysql/postgres. Rather than add REQUIRED_USE which harms automation
for arch testing, we conditionally delete the test for now.

(We could alternatively add a bunch of stuff as test-dependencies only, but
I wanted a minimal change to the ebuild for now.)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/spamassassin/spamassassin-3.4.5.ebuild | 7 +++++++
 mail-filter/spamassassin/spamassassin-3.4.6.ebuild | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
index 562694ddd4c..732579b8757 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
@@ -107,6 +107,13 @@ src_prepare() {
 	# workaround.
 	perl_rm_files t/spamc_*.t
 
+	# Some tests need extra dependencies
+	# e.g. t/sql_based_whitelist.t needs DBD
+	# This is kinder than REQUIRED_USE for tests which hurts automation
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		perl_rm_files t/sql_based_whitelist.t
+	fi
+
 	# Disable plugin by default
 	sed -i -e 's/^loadplugin/\#loadplugin/g' \
 		"rules/init.pre" \

diff --git a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
index 562694ddd4c..732579b8757 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
@@ -107,6 +107,13 @@ src_prepare() {
 	# workaround.
 	perl_rm_files t/spamc_*.t
 
+	# Some tests need extra dependencies
+	# e.g. t/sql_based_whitelist.t needs DBD
+	# This is kinder than REQUIRED_USE for tests which hurts automation
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		perl_rm_files t/sql_based_whitelist.t
+	fi
+
 	# Disable plugin by default
 	sed -i -e 's/^loadplugin/\#loadplugin/g' \
 		"rules/init.pre" \