Testsuite: more tidying for Alpine

[users/jgh/exim.git] / test / scripts / 2100-OpenSSL / 2102

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 3465235b0711a1956f125f9b3522f1c1b435ce90..9a9f4d7bd2d071211ebb7b09e14b9578c952e125 100644 (file)
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -4,7 +4,9 @@
 # when more than one cert is loaded, which the conf for this testcase does.
 # As a result the expansion done and logged is misleading.
 # While the golden log output is set to the misleading result, the testcase
 # when more than one cert is loaded, which the conf for this testcase does.
 # As a result the expansion done and logged is misleading.
 # While the golden log output is set to the misleading result, the testcase

-# will unfortunately fail on the fixed OpenSSL versions.
+# would unfortunately fail on the fixed OpenSSL versions.  This has been bodged
+# by the addition of log/2102.openssl_1_1_1 and some detection coding in
+# runtest to force a "flavour".  This is fragile and bound to break in the future.

 #
 # Make RSA authentication the only acceptable
 exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D
 #
 # Make RSA authentication the only acceptable
 exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D


@@ -20,7 +22,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

-mail from:<CALLER@test.ex>
+mail from:<a@test.ex>

 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250


@@ -82,7 +84,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

-mail from:<CALLER@test.ex>
+mail from:<b@test.ex>

 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250


@@ -113,7 +115,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

-mail from:<CALLER@test.ex>
+mail from:<c@test.ex>

 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250