You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2020/10/06 10:20:41 UTC
svn commit: r1882269 - in /spamassassin: branches/3.4/t/README
branches/3.4/t/sa_awl.t branches/3.4/t/sa_check_spamd.t trunk/t/README
trunk/t/sa_awl.t trunk/t/sa_check_spamd.t
Author: gbechis
Date: Tue Oct 6 10:20:40 2020
New Revision: 1882269
URL: http://svn.apache.org/viewvc?rev=1882269&view=rev
Log:
Make it possible to run the Spamassassin test suite against the installed
SpamAssassin files (rather than those in the source directory)
bz #7860
Modified:
spamassassin/branches/3.4/t/README
spamassassin/branches/3.4/t/sa_awl.t
spamassassin/branches/3.4/t/sa_check_spamd.t
spamassassin/trunk/t/README
spamassassin/trunk/t/sa_awl.t
spamassassin/trunk/t/sa_check_spamd.t
Modified: spamassassin/branches/3.4/t/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/README?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/README (original)
+++ spamassassin/branches/3.4/t/README Tue Oct 6 10:20:40 2020
@@ -82,6 +82,9 @@ SPAMD_PORT
SPAMD_LOCALHOST
SPAMASSASSIN_SCRIPT
SPAMC_SCRIPT
+SPAMD_SCRIPT
+SAAWL_SCRIPT
+SACHECKSPAMD_SCRIPT
SALEARN_SCRIPT
SA_ARGS
SC_ARGS
Modified: spamassassin/branches/3.4/t/sa_awl.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/sa_awl.t?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/sa_awl.t (original)
+++ spamassassin/branches/3.4/t/sa_awl.t Tue Oct 6 10:20:40 2020
@@ -21,7 +21,7 @@ sarun("--add-addr-to-whitelist whitelist
\&patterns_run_cb);
untaint_system("pwd");
-untaint_system("../sa-awl --clean --min 9999 ./log/awltest");
+saawlrun("--clean --min 9999 ./log/awltest");
sarun ("-L -t < data/spam/004", \&patterns_run_cb);
ok_all_patterns();
Modified: spamassassin/branches/3.4/t/sa_check_spamd.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/sa_check_spamd.t?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/sa_check_spamd.t (original)
+++ spamassassin/branches/3.4/t/sa_check_spamd.t Tue Oct 6 10:20:40 2020
@@ -22,10 +22,10 @@ ok(spamcrun("< data/spam/001", \&pattern
ok_all_patterns();
my $p = $spamdport;
-untaint_system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
+sacheckspamdrun("--hostname $spamdhost --port $p --verbose");
ok (($? >> 8) == 0);
ok(stop_spamd());
-untaint_system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
+sacheckspamdrun("--hostname $spamdhost --port $p --verbose");
ok (($? >> 8) != 0);
Modified: spamassassin/trunk/t/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/README?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/trunk/t/README (original)
+++ spamassassin/trunk/t/README Tue Oct 6 10:20:40 2020
@@ -80,8 +80,11 @@ values.
SPAMD_HOST
SPAMD_PORT
SPAMD_LOCALHOST
+SPAMD_SCRIPT
SPAMASSASSIN_SCRIPT
SPAMC_SCRIPT
+SAAWL_SCRIPT
+SACHECKSPAMD_SCRIPT
SALEARN_SCRIPT
SA_ARGS
SC_ARGS
Modified: spamassassin/trunk/t/sa_awl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_awl.t?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_awl.t (original)
+++ spamassassin/trunk/t/sa_awl.t Tue Oct 6 10:20:40 2020
@@ -21,7 +21,7 @@ sarun("--add-addr-to-whitelist whitelist
\&patterns_run_cb);
untaint_system("pwd");
-untaint_system("../sa-awl --clean --min 9999 ./log/awltest");
+saawlrun("--clean --min 9999 ./log/awltest");
sarun ("-L -t < data/spam/004", \&patterns_run_cb);
ok_all_patterns();
Modified: spamassassin/trunk/t/sa_check_spamd.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_check_spamd.t?rev=1882269&r1=1882268&r2=1882269&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_check_spamd.t (original)
+++ spamassassin/trunk/t/sa_check_spamd.t Tue Oct 6 10:20:40 2020
@@ -22,10 +22,10 @@ ok(spamcrun("< data/spam/001", \&pattern
ok_all_patterns();
my $p = $spamdport;
-untaint_system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
+sacheckspamdrun("--hostname $spamdhost --port $p --verbose");
ok (($? >> 8) == 0);
ok(stop_spamd());
-untaint_system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
+sacheckspamdrun("--hostname $spamdhost --port $p --verbose");
ok (($? >> 8) != 0);