Testsuite: avoid time-quantization issue

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index efb352b234422534823619a4f84c28e0e4ef5389..df7de0d9a079e2283bd751104981fad04ebc6de4 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -460,7 +460,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     {
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;
     {
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;

-    my($increment) = date_seconds($date3) - date_seconds($date2);
+
+    # Round the time-difference up to nearest even value
+    my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1;

 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the
 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the


@@ -1117,7 +1119,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if / in tls_advertise_requiretls?\? no \(end of list\)/;
 
     # TCP Fast Open
     next if / in tls_advertise_requiretls?\? no \(end of list\)/;
 
     # TCP Fast Open

-    next if /^setsockopt FASTOPEN: Network Error/;
+    next if /^(ppppp )?setsockopt FASTOPEN: Network Error/;
+
+    # Experimental_PIPE_CONNECT
+    next if / in (pipelining_connect_advertise_hosts|hosts_pipe_connect)?\? no /;

 
     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;
 
     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;


@@ -1628,9 +1633,11 @@ $munges =
     { 'stdout' => '/^(
                   dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity|timestamps)
                   |gnutls_require_(kx|mac|protocols)
     { 'stdout' => '/^(
                   dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity|timestamps)
                   |gnutls_require_(kx|mac|protocols)

+                 |hosts_pipe_connect

                   |hosts_(requ(est|ire)|try)_(dane|ocsp)
                  |dane_require_tls_ciphers
                   |hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls
                   |hosts_(requ(est|ire)|try)_(dane|ocsp)
                  |dane_require_tls_ciphers
                   |hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls

+                  |pipelining_connect_advertise_hosts

                   |socks_proxy
                   |tls_[^ ]*
                  |utf8_downconvert
                   |socks_proxy
                   |tls_[^ ]*
                  |utf8_downconvert


@@ -2656,7 +2663,7 @@ GetOptions(
     'valgrind' => \$valgrind,
     'range=s{2}'       => \my @range_wanted,
     'test=i@'          => \my @tests_wanted,
     'valgrind' => \$valgrind,
     'range=s{2}'       => \my @range_wanted,
     'test=i@'          => \my @tests_wanted,

-    'flavor|flavour=s' => $flavour,
+    'flavor|flavour=s' => \$flavour,

     'help'             => sub { pod2usage(-exit => 0) },
     'man'              => sub {
         pod2usage(
     'help'             => sub { pod2usage(-exit => 0) },
     'man'              => sub {
         pod2usage(


@@ -3380,6 +3387,12 @@ if ($parm_hostname =~ /[[:upper:]]/)
   print "\n*** Host name has upper case characters: this may cause problems ***\n\n";
   }
 
   print "\n*** Host name has upper case characters: this may cause problems ***\n\n";
   }
 

+if ($parm_hostname =~ /\.example\.com$/)
+  {
+  die "\n*** Host name ends in .example.com; this conflicts with the testsuite use of that domain.\n"
+       . "    Please change the host's name (or comment out this check, and fail several testcases)\n";
+  }
+

 
 
 ##################################################
 
 
 ##################################################