svn commit: r917960 - /spamassassin/trunk/build/mkupdates/run_part2

[jm...@apache.org]

Author: jm
Date: Tue Mar  2 11:14:50 2010
New Revision: 917960

URL: http://svn.apache.org/viewvc?rev=917960&view=rev
Log:
bug 6297: try this again.  re-add some additional paranoia

Modified:
    spamassassin/trunk/build/mkupdates/run_part2

Modified: spamassassin/trunk/build/mkupdates/run_part2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/run_part2?rev=917960&r1=917959&r2=917960&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Tue Mar  2 11:14:50 2010
@@ -67,9 +67,6 @@
 $PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $?
 make                                     || exit $?
 
-# remove the rules files for rules we won't be shipping
-rm rules/70_sandbox.cf rules/70_inactive.cf
-
 # remove new features, unsupported in existing code in the field
 # (TODO: need a better way to exclude files that require new features
 # like this; judicious use of "ifplugin" helps)
@@ -78,12 +75,15 @@
 # ensure the basic lint/rule-sanity test suite passes for this ruleset
 # before we build an update from it.  useful particularly to catch
 # "tflags nopublish" leakage (bug 6297)
-RULE_LINT_TESTS="
-        t/basic_lint.t
-        t/basic_lint_without_sandbox.t
-        t/basic_meta.t
-"
-make test TEST_FILES="$RULE_LINT_TESTS" || exit $?
+make test \
+    TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" \
+    || exit $?
+
+# remove the rules files for rules we won't be shipping
+rm rules/70_sandbox.cf rules/70_inactive.cf
+
+# double check we still lint without those 2 files
+./spamassassin --lint                   || exit $?
 
 rulesdir=`pwd`/rules