Move the regression test for CVE-2019-15846 to 1100-Basic-TLS/1100

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

diff --git a/test/runtest b/test/runtest
index 1df7fc718f55dc609331d74343c44f477e18b530..aadd0f1990d8dc56eafca6b676ad1f6490ced68d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1158,6 +1158,12 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Platform-dependent error strings
     s/Operation timed out/Connection timed out/;
 
     # Platform-dependent error strings
     s/Operation timed out/Connection timed out/;
 

+    # Platform-dependent resolver option bits
+    s/^ (?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
+
+    # timing variance, run-to-run
+    s/^time on queue = \K1s/0s/;
+

     # 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;
     # 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;