svn commit: r904026 - /spamassassin/trunk/t/basic_lint_without_sandbox.t

[jm...@apache.org]

Author: jm
Date: Thu Jan 28 10:25:06 2010
New Revision: 904026

URL: http://svn.apache.org/viewvc?rev=904026&view=rev
Log:
avoid test failures when 'make disttest' is run, since 70_sandbox.cf is not distributed in the tarball

Modified:
    spamassassin/trunk/t/basic_lint_without_sandbox.t

Modified: spamassassin/trunk/t/basic_lint_without_sandbox.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint_without_sandbox.t?rev=904026&r1=904025&r2=904026&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint_without_sandbox.t (original)
+++ spamassassin/trunk/t/basic_lint_without_sandbox.t Thu Jan 28 10:25:06 2010
@@ -17,10 +17,15 @@
 # override locale for this test!
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';
 
+my $scoresfile  = "log/test_rules_copy/50_scores.cf";
 my $sandboxfile = "log/test_rules_copy/70_sandbox.cf";
-ok (-f $sandboxfile);
+
+# when running from the built tarball or make disttest, we will not have a full
+# rules dir -- therefore no 70_sandbox.cf.  We will also have no 50_scores.cf,
+# so we can use that to tell if this is the case
+skip (!-f $scoresfile, -f $sandboxfile);
 unlink $sandboxfile;
-ok (!-f $sandboxfile);
+skip (!-f $scoresfile, !-f $sandboxfile);
 
 sarun ("-L --lint", \&patterns_run_cb);
 ok_all_patterns();