Move bdat_ungetc decl to hdr ∵ receive.c uses too

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 15631dfeb4273d789ec460b40ede416fa967d871..b82b6b98ccf4ea5dd88ef733d8431469deb6937b 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -61,6 +61,7 @@ my $more = 'less -XF';
 my $optargs = '';
 my $save_output = 0;
 my $server_opts = '';
 my $optargs = '';
 my $save_output = 0;
 my $server_opts = '';

+my $slow = 0;

 my $valgrind = 0;
 
 my $have_ipv4 = 1;
 my $valgrind = 0;
 
 my $have_ipv4 = 1;


@@ -1525,7 +1526,7 @@ $munges =
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     'debuglog_stdout' =>
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     'debuglog_stdout' =>

-    { 'stdout' => 's/^[ .]*\d\d:\d\d:\d\d\s+\d+ //;
+    { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //;

                   s/Process \d+ is ready for new message/Process pppp is ready for new message/'
     },
 
                   s/Process \d+ is ready for new message/Process pppp is ready for new message/'
     },
 


@@ -2550,6 +2551,7 @@ while (@ARGV > 0 && $ARGV[0] =~ /^-/)
     if ($arg eq "-NOIPV4") { $have_ipv4 = 0; next; }
     if ($arg eq "-NOIPV6") { $have_ipv6 = 0; next; }
     if ($arg eq "-KEEP")   { $save_output = 1; next; }
     if ($arg eq "-NOIPV4") { $have_ipv4 = 0; next; }
     if ($arg eq "-NOIPV6") { $have_ipv6 = 0; next; }
     if ($arg eq "-KEEP")   { $save_output = 1; next; }

+    if ($arg eq "-SLOW")   { $slow = 1; next; }

     if ($arg eq "-VALGRIND")   { $valgrind = 1; next; }
     if ($arg =~ /^-FLAVOU?R$/) { $flavour = shift; next; }
     }
     if ($arg eq "-VALGRIND")   { $valgrind = 1; next; }
     if ($arg =~ /^-FLAVOU?R$/) { $flavour = shift; next; }
     }


@@ -3997,6 +3999,7 @@ foreach $test (@test_list)
 
   if ($docheck)
     {
 
   if ($docheck)
     {

+    sleep 1 if $slow;

     my $rc = check_output($TEST_STATE->{munge});
     log_test($log_summary_filename, $testno, 'P') if ($rc == 0);
     if ($rc < 2)
     my $rc = check_output($TEST_STATE->{munge});
     log_test($log_summary_filename, $testno, 'P') if ($rc == 0);
     if ($rc < 2)