X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/78598e6a6a8cda8d1b50685188682749929df614..481e63ca2bbd7b603e5bb84f6582ab4be5e3300d:/test/runtest?ds=sidebyside diff --git a/test/runtest b/test/runtest index 14601c671..c590ffc31 100755 --- a/test/runtest +++ b/test/runtest @@ -893,7 +893,7 @@ RESET_AFTER_EXTRA_LINE_READ: # The sizes of filter files may vary because of the substitution of local # filenames, logins, etc. - s/^\d+(?= bytes read from )/ssss/; + s/^\d+(?= (\(tainted\) )?bytes read from )/ssss/; # ======== OpenSSL error messages ======== @@ -943,9 +943,7 @@ RESET_AFTER_EXTRA_LINE_READ: # at least we'll still be checking the number of open fd's. s/max fd = \d+/max fd = dddd/; - s/status=0 RDONLY/STATUS/g; - s/status=1 WRONLY/STATUS/g; - s/status=2 RDWR/STATUS/g; + s/status=[0-9a-f]+ (?:RDONLY|WRONLY|RDWR)/STATUS/g; # ======== Contents of spool files ========