[exim-cvs] Test suite mostly clean for 4.73/4.74.

Gitweb: http://git.exim.org/exim.git/commitdiff/8f1cff481ae440b8ced8601cd2a2134714580d3c

Commit:     8f1cff481ae440b8ced8601cd2a2134714580d3c
Parent:     ebd9bd7d2ef66379770eb415b360b6b880784f7b
Author:     Phil Pennock <pdp@???>
AuthorDate: Sun Jan 30 03:13:21 2011 -0500
Committer:  Phil Pennock <pdp@???>
CommitDate: Sun Jan 30 03:13:21 2011 -0500

    Test suite mostly clean for 4.73/4.74.

    With this, I can run the test suite with few enough differences that I
    can review and confirm, getting as far as Basic/0094.

    Pretty much just dealing with new stderr from debugging.
---
 test/runtest |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/test/runtest b/test/runtest
index d70b98c..324049f 100755
--- a/test/runtest
+++ b/test/runtest
@@ -299,6 +299,7 @@ $spid = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";

while(<IN>)
{
+RESET_AFTER_EXTRA_LINE_READ:
# Check for "*** truncated ***"
$yield = 1 if /\*\*\* truncated \*\*\*/;

@@ -737,6 +738,33 @@ while(<IN>)
     next if /OpenSSL compile-time version: OpenSSL \d+[\.\da-z]+/;
     next if /OpenSSL runtime version: OpenSSL \d+[\.\da-z]+/;

+    # drop lookups
+    next if /^Lookups \(built-in\):/;
+    next if /^Total \d+ lookups/;
+
+    # and the ugly bit
+    # different libraries will have different numbers (possibly 0) of follow-up
+    # lines, indenting with more data
+    if (/^Library version:/) {
+      while (1) {
+    $_ = <IN>;
+    next if /^\s/;
+    goto RESET_AFTER_EXTRA_LINE_READ;
+      }
+    }
+
+    # drop other build-time controls emitted for debugging
+    next if /^WHITELIST_D_MACROS:/;
+    next if /^TRUSTED_CONFIG_LIST:/;
+
+    # As of Exim 4.74, we log when a setgid fails; because we invoke Exim
+    # with -be, privileges will have been dropped, so this will always
+    # be the case
+    next if /^changing group to \d+ failed: Operation not permitted/;
+
+    # We invoke Exim with -D, so we hit this new messag as of Exim 4.73:
+    next if /^macros_trusted overriden to true by whitelisting/;
+
     # We have to omit the localhost ::1 address so that all is well in
     # the IPv4-only case.