From 41fe1044d59beb0fd434489adc616d72113dc520 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 29 2019 11:54:31 +0000 Subject: Merge pull request #42 from psgreco/c8fixes Fix spamassassin tests in CentOS8 --- diff --git a/tests/p_spamassassin/spamassassin_test.sh b/tests/p_spamassassin/spamassassin_test.sh index f733bec..f4435c3 100755 --- a/tests/p_spamassassin/spamassassin_test.sh +++ b/tests/p_spamassassin/spamassassin_test.sh @@ -3,8 +3,10 @@ t_Log "Running $0 - check that spamassassin can detect spam." -VERSION=`t_GetPkgVer spamassassin` +if [ "$centos_ver" -lt 8 ] ; then +VERSION=-`t_GetPkgVer spamassassin` +fi spamassassin --lint &&\ -spamassassin < /usr/share/doc/spamassassin-${VERSION}/sample-spam.txt | grep -q 'X-Spam-Flag: YES' +spamassassin < /usr/share/doc/spamassassin${VERSION}/sample-spam.txt | grep -q 'X-Spam-Flag: YES' t_CheckExitStatus $?