From 42427533718a750c21e3bc03df94c6f93581eaec Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 26 Oct 2017 20:20:41 +0100 Subject: [PATCH] Testsuite: OpenSSL version output variances --- test/log/2124 | 2 +- test/runtest | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/log/2124 b/test/log/2124 index cafa67b4d..72f0a5342 100644 --- a/test/log/2124 +++ b/test/log/2124 @@ -4,4 +4,4 @@ 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <> 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_CTX_use_certificate_chain_file file=/non/exist): error:02001002:system library:fopen:No such file or directory +1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_CTX_use_certificate_chain_file file=/non/exist): error:xxxxxxxx:system library:fopen:No such file or directory diff --git a/test/runtest b/test/runtest index 94ecd6944..b6babd06a 100755 --- a/test/runtest +++ b/test/runtest @@ -1175,8 +1175,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/(=>.* K C="250- \d)\d+ (byte chunk, total \d)\d+/$1nn $2nn/; # openssl version variances - s/(TLS error on connection .*: error:)[0-9A-F]{8}(:system library):func\(4095\):(No such file or - directory)$/$1xxxxxxxx$2:fopen:$3/; + s/(TLS error on connection [^:]*: error:)[0-9A-F]{8}(:system library):(?:fopen|func\(4095\)):(No such file or directory)$/$1xxxxxxxx$2:fopen:$3/; } # ======== All files other than stderr ======== -- 2.30.2