Merge branch 'master' into 4.next

11 files changed, 42 insertions, 19 deletions

diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index cb0bb188f..dd9cea255 100644
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -133,6 +133,7 @@ addresses: ${addresses:>+ Exim Person <local-part@dom.ain> (that's me),\
 addresses: ${addresses:Exim Person <local-part@dom.ain> (that's me), \
            xyz@abc, nullgroupname:;, group: p@q, r@s; }
 addresses: ${addresses:local-part@dom.ain <local-part@dom.ain>}
+addresses: ${addresses:>}
 
 escape:     ${escape:B7·F2ò}
 excape8bit: ${escape8bit:undisturbed text\ttab\nnewline\ttab\\backslash \176tilde\177DEL\200\x81.}
diff --git a/test/scripts/0000-Basic/0476 b/test/scripts/0000-Basic/0476
index a7ddb0f4b..b068a16a0 100644
--- a/test/scripts/0000-Basic/0476
+++ b/test/scripts/0000-Basic/0476
@@ -1,4 +1,5 @@
 # RSET error for multiple messages
+munge peer_terminated_conn
 need_ipv4
 #
 exim -odi -odqs userx@test.ex
diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901
index 5e88c5ae9..f5a6fff9a 100644
--- a/test/scripts/0000-Basic/0901
+++ b/test/scripts/0000-Basic/0901
@@ -247,11 +247,7 @@ MAIL FROM:someone9@some.domain
 ??? 250
 RCPT TO:CALLER@test.ex
 ??? 250
-BDAT 1\r\nTBDAT 87 last
-o: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
+BDAT 1\r\nTBDAT 87 last\r\no: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n\r\n
 ??? 554 SMTP synchronization error
 ****
 #
diff --git a/test/scripts/2000-GnuTLS/2030 b/test/scripts/2000-GnuTLS/2030
index ef7a8dea2..b009d476b 100644
--- a/test/scripts/2000-GnuTLS/2030
+++ b/test/scripts/2000-GnuTLS/2030
@@ -6,5 +6,5 @@ exim -DSERVER=server -bd -oX PORT_D
 exim CALLER@test.ex
 Test message.
 ****
-millisleep 500
+sleep 1
 killdaemon
diff --git a/test/scripts/2000-GnuTLS/2031 b/test/scripts/2000-GnuTLS/2031
index 76186b5e4..d302738fd 100644
--- a/test/scripts/2000-GnuTLS/2031
+++ b/test/scripts/2000-GnuTLS/2031
@@ -6,14 +6,14 @@ exim -DSERVER=server -bd -oX PORT_D
 exim CALLER@test.ex
 Test message.
 ****
-millisleep 700
+sleep 1
 #
 #
 # Extended: server uses SNI to choose certificate
 exim abcd@test.ex
 Test message.
 ****
-millisleep 700
+sleep 1
 #
 #
 killdaemon
diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/2000-GnuTLS/2038
index 83259d998..650286814 100644
--- a/test/scripts/2000-GnuTLS/2038
+++ b/test/scripts/2000-GnuTLS/2038
@@ -16,4 +16,3 @@ exim -qqf
 killdaemon
 exim -DSERVER=server -DNOTDAEMON -qf
 ****
-sortlog
diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index cbb9ce393..bdf5496f6 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -47,6 +47,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
+# nonloop addr conn rejected lacking cert
 client-ssl HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
@@ -57,7 +58,10 @@ ehlo rhu.barb
 ??? 250-
 ??? 250
 starttls
-??? 220
+??? 220 TLS go ahead
++++ 1
+help
+??? 554
 ****
 client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
 ??? 220
diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index 620a63f57..4a12fb0bb 100644
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -58,6 +58,9 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
++++ 1
+help
+??? 554
 ****
 client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 ??? 220
diff --git a/test/scripts/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138
index 3a94a1f2e..79eaa2f31 100644
--- a/test/scripts/2100-OpenSSL/2138
+++ b/test/scripts/2100-OpenSSL/2138
@@ -15,4 +15,3 @@ exim -qqf
 killdaemon
 exim -DSERVER=server -DNOTDAEMON -qf
 ****
-sortlog
diff --git a/test/scripts/2800-lmdb/2800 b/test/scripts/2800-lmdb/2800
index a074ae628..930f9f2bc 100644
--- a/test/scripts/2800-lmdb/2800
+++ b/test/scripts/2800-lmdb/2800
@@ -1,11 +1,30 @@
 # lmdb lookup
+#
+# prep a test database to work with
+perl -e 'chdir "DIR/aux-var"; exec "mdb_load -n DIR/aux-var/TESTNUM.mdb";'
+VERSION=3
+format=print
+type=btree
+mapsize=10485760
+maxreaders=126
+HEADER=END
+ first
+ data for first
+ second
+ A=1 B=2
+ third
+ A1:B2:C3
+DATA=END
+****
+#
+#
 exim -be
-${lookup{first}lmdb{DIR/aux-fixed/TESTNUM.mdb}}
-${lookup{first}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}
-${lookup{fail}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}{failure value}}
-${lookup{fail}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}
-${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}
-${extract{A}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}}
-${extract{B}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}}
-${extract{C}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}{$value}fail}
+${lookup{first}lmdb{DIR/aux-var/TESTNUM.mdb}}
+${lookup{first}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}
+${lookup{fail}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}{failure value}}
+${lookup{fail}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}
+${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}
+${extract{A}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}}
+${extract{B}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}}
+${extract{C}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}{$value}fail}
 ****
diff --git a/test/scripts/3000-Perl/3000 b/test/scripts/3000-Perl/3000
index 30ac29eb3..60db492ad 100644
--- a/test/scripts/3000-Perl/3000
+++ b/test/scripts/3000-Perl/3000
@@ -1,4 +1,5 @@
 # Embedded Perl
+munge perl_variants
 exim -be
 ${perl{foo}}
 ${perl{foo}{arg1}}