svn commit: r805577 - /spamassassin/trunk/t.rules/run

[jm...@apache.org]

Author: jm
Date: Tue Aug 18 21:05:24 2009
New Revision: 805577

URL: http://svn.apache.org/viewvc?rev=805577&view=rev
Log:
port t.rules/run to use Test::More so that valid TAP output is produced

Modified:
    spamassassin/trunk/t.rules/run

Modified: spamassassin/trunk/t.rules/run
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t.rules/run?rev=805577&r1=805576&r2=805577&view=diff
==============================================================================
--- spamassassin/trunk/t.rules/run (original)
+++ spamassassin/trunk/t.rules/run Tue Aug 18 21:05:24 2009
@@ -1,6 +1,4 @@
 #!/usr/bin/perl
-#
-# TODO: Generate TAP output
 
 sub usage {
   die "
@@ -17,6 +15,7 @@
 use strict;
 use warnings;
 
+use Test::More qw(no_plan);
 use Getopt::Long;
 Getopt::Long::Configure(
   qw(bundling no_getopt_compat
@@ -44,6 +43,9 @@
 my $verbose = $opt{'verbose'};
 $opt{'tests'} ||= join " ", <t.rules/*>;
 my $testsfailed = 0;
+my $testcounter = 1;
+$| = 1;
+
 if (@ARGV) {
   foreach my $f (@ARGV) {
     if (-d $f) {    # recurse down 1 level
@@ -111,33 +113,33 @@
 
   if ($testsline =~ /(?:[ ,]|^)\Q$rule\E(?:[ ,]|$)/) {
     if ($want_hit) {
-      pass($rule, $f, "$testsline");
+      mypass($rule, $f, "$testsline");
     } else {
-      fail($rule, $f, "want=n got=y: $testsline");
+      myfail($rule, $f, "want=n got=y: $testsline");
     }
   } else {
     if ($want_hit) {
-      fail($rule, $f, "want=y got=n: $testsline");
+      myfail($rule, $f, "want=y got=n: $testsline");
     } else {
-      pass($rule, $f, "$testsline");
+      mypass($rule, $f, "$testsline");
     }
   }
 }
 
 # ---------------------------------------------------------------------------
 
-sub fail {
+sub myfail {
   my ($rule, $f, $err) = @_;
-  print "NOT ok on $f for $rule: $err\n";
+  ok 0, "$f for $rule: $err";
   $testsfailed++;
 }
 
-sub pass {
+sub mypass {
   my ($rule, $f, $err) = @_;
   if (!$verbose) {
-    print "ok on $f\n"
+    ok 1, $f;
   } else {
-    print "ok on $f for $rule: $err\n"
+    ok 1, "$f for $rule: $err";
   }
 }