tidying

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index d0de8622e4b448bb88cc2240abfde41da846464a..5671fead24ab93a1ee3ff9f7cab4f39bacb6571d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1158,6 +1158,7 @@ RESET_AFTER_EXTRA_LINE_READ:
                 /^Support for:/ ||
                 /^Routers:/ ||
                 /^Transports:/ ||
                 /^Support for:/ ||
                 /^Routers:/ ||
                 /^Transports:/ ||

+                /^Malware:/ ||

                 /^log selectors =/ ||
                 /^cwd=/ ||
                 /^Fixed never_users:/ ||
                 /^log selectors =/ ||
                 /^cwd=/ ||
                 /^Fixed never_users:/ ||


@@ -2840,6 +2841,15 @@ while (<EXIMINFO>)
         }
       }
     }
         }
       }
     }

+
+  elsif (/^Malware: (.*)/)
+    {
+    print;
+    @temp = split /(\s+)/, $1;
+    push(@temp, ' ');
+    %parm_malware = @temp;
+    }
+

   }
 close(EXIMINFO);
 print "-" x 78, "\n";
   }
 close(EXIMINFO);
 print "-" x 78, "\n";


@@ -3510,6 +3520,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
         {
         if (!defined $parm_transports{$1}) { $wantthis = 0; last; }
         }
         {
         if (!defined $parm_transports{$1}) { $wantthis = 0; last; }
         }

+      elsif (/^malware (.*)$/)
+        {
+        if (!defined $parm_malware{$1}) { $wantthis = 0; last; }
+        }

       else
         {
         tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\"");
       else
         {
         tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\"");