diff options
| -rwxr-xr-x | test/runtest | 50 | ||||
| -rw-r--r-- | test/stderr/0002 | 27 |
2 files changed, 17 insertions, 60 deletions
diff --git a/test/runtest b/test/runtest index 4843fa80e..f6e57b4b5 100755 --- a/test/runtest +++ b/test/runtest @@ -564,25 +564,6 @@ RESET_AFTER_EXTRA_LINE_READ: # signature algorithm names s/RSA-SHA1/RSA-SHA/; - # -d produces a list of environment variables as they are checked if they exist - # in the environment. Unfortunately this list isn't always in the same order. For now we - # just remove this list - # - if (/^\w+ in keep_environment/) - { - my @lines = $_; - while (<IN>) - { - if (/^\w+ in keep_environment/) - { - push @lines, $_; - next; - } - print MUNGED sort grep { !/^(SHLVL|_) / } @lines; - redo LINE; - } - } - # ======== Caller's login, uid, gid, home, gecos ======== @@ -1023,6 +1004,23 @@ RESET_AFTER_EXTRA_LINE_READ: while (<IN>) { last if !/^\s/; } } + # remote port numbers vary + s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/; + + # Skip hosts_require_dane checks when the options + # are unset, because dane ain't always there. + + next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x; + + # SUPPORT_PROXY + next if /host in hosts_proxy\?/; + + # Experimental_International + next if / in smtputf8_advertise_hosts\? no \(option unset\)/; + + # Environment cleaning + next if /\w+ in keep_environment\? (yes|no)/; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to @@ -1044,20 +1042,6 @@ RESET_AFTER_EXTRA_LINE_READ: @saved = (); } - # remote port numbers vary - s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/; - - # Skip hosts_require_dane checks when the options - # are unset, because dane ain't always there. - - next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x; - - # SUPPORT_PROXY - next if /host in hosts_proxy\?/; - - # Experimental_International - next if / in smtputf8_advertise_hosts\? no \(option unset\)/; - # Skip some lines that Exim puts out at the start of debugging output # because they will be different in different binaries. diff --git a/test/stderr/0002 b/test/stderr/0002 index d94e3686a..b4f06a104 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -130,15 +130,6 @@ expanding: -oMt sender_ident = $sender_ident Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp -PATH in keep_environment? no (end of list) -PWD in keep_environment? no (end of list) -SHELL in keep_environment? no (end of list) -TERM in keep_environment? no (end of list) -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -198,15 +189,6 @@ search_tidyup called Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp -PATH in keep_environment? no (end of list) -PWD in keep_environment? no (end of list) -SHELL in keep_environment? no (end of list) -TERM in keep_environment? no (end of list) -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -391,15 +373,6 @@ LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=pppp -PATH in keep_environment? no (end of list) -PWD in keep_environment? no (end of list) -SHELL in keep_environment? no (end of list) -TERM in keep_environment? no (end of list) -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") -USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME |