LDAP: Check for errors of TLS initialisation

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

diff --git a/test/runtest b/test/runtest
index e71ee9fec0932659dff734300b65a8a71157c406..69c6931b082c013f96e4b705c9710784d95e7219 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -598,7 +598,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   # Handle only the Gnu and MacOS space, dot, plus and at-sign.  A full [[:graph:]]
   # unfortunately matches a non-ls linefull of dashes.
   # Allow the case where we've already picked out the file protection bits.
   # Handle only the Gnu and MacOS space, dot, plus and at-sign.  A full [[:graph:]]
   # unfortunately matches a non-ls linefull of dashes.
   # Allow the case where we've already picked out the file protection bits.

-  s/^([-d](?:[-r][-w][-SsTtx]){3})[.+@]?( +|$)/\1 /;
+  if (s/^([-d](?:[-r][-w][-SsTtx]){3})[.+@]?( +|$)/\1\2/) {
+    s/ +/ /g;
+  }

 
 
   # ======== Message sizes =========
 
 
   # ======== Message sizes =========


@@ -687,6 +689,12 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/^\d\d\d(?=[PFS*])/ddd/;
 
 
   s/^\d\d\d(?=[PFS*])/ddd/;
 
 

+  # ========= Exim lookups ==================
+  # Lookups have a char which depends on the number of lookup types compiled in,
+  # in stderr output.  Replace with a "0".  Recognising this while avoiding
+  # other output is fragile; perhaps the debug output should be revised instead.
+  s%(?<!sqlite)(?<!lsearch\*@)(?<!lsearch\*)(?<!lsearch)[0-?]TESTSUITE/aux-fixed/%0TESTSUITE/aux-fixed/%g;
+

   # ==========================================================
   # Some munging is specific to the specific file types
 
   # ==========================================================
   # Some munging is specific to the specific file types
 


@@ -932,7 +940,7 @@ if ($_[1]) { $_ = "u"; print "... update forced\n"; }
 #             [4] TRUE if this is a log file whose deliveries must be sorted
 #
 # Returns:    0 comparison succeeded or differences to be ignored
 #             [4] TRUE if this is a log file whose deliveries must be sorted
 #
 # Returns:    0 comparison succeeded or differences to be ignored

-#             1 comparison failed; files were updated (=> re-compare)
+#             1 comparison failed; files may have been updated (=> re-compare)

 #
 # Does not return if the user replies "Q" to a prompt.
 
 #
 # Does not return if the user replies "Q" to a prompt.
 


@@ -1090,9 +1098,10 @@ if (-e $sf)
   print "\n";
   for (;;)
     {
   print "\n";
   for (;;)
     {

-    interact("Continue, Update & retry, Quit? [Q] ", $force_update);
+    interact("Continue, Retry, Update & retry, Quit? [Q] ", $force_update);

     tests_exit(1) if /^q?$/i;
     return 0 if /^c$/i;
     tests_exit(1) if /^q?$/i;
     return 0 if /^c$/i;

+    return 1 if /^r$/i;

     last if (/^u$/i);
     }
   }
     last if (/^u$/i);
     }
   }


@@ -1124,7 +1133,7 @@ return 1;
 #
 # Arguments: none
 # Returns:   0 if the output compared equal
 #
 # Arguments: none
 # Returns:   0 if the output compared equal

-#            1 if files were updated and the test must be re-run
+#            1 if re-run needed (files may have been updated)

 
 sub check_output{
 my($yield) = 0;
 
 sub check_output{
 my($yield) = 0;