Testsuite: munge for Cyrus SASL library version output changes

[exim.git] / test / scripts / 0000-Basic / 0022

diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index 92d95517116fef48f4f9ed7943d44368e3cc34ef..9c7837304749a0036bd326cf14c41f17501a6abb 100644 (file)
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -1,29 +1,36 @@
 # Extra ACLs: freeze/defer/drop/queue/delay/$host_data
 exim -d -bh V4NET.9.8.7
 # Extra ACLs: freeze/defer/drop/queue/delay/$host_data
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data

+

 Testing
 .
 quit
 ****
 exim -d -bh V4NET.9.8.7
 Testing
 .
 quit
 ****
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data

+

 Testing
 .
 quit
 ****
 exim -d -bh V4NET.9.8.7
 Testing
 .
 quit
 ****
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data

+

 Testing
 .
 quit
 ****
 exim -bh V4NET.9.8.7
 Testing
 .
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<defer@y>
 rcpt to:<accept@y>
 mail from:<x@y>
 rcpt to:<defer@y>
 rcpt to:<accept@y>


@@ -32,17 +39,20 @@ rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<>
 rcpt to:<defer_senders@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<>
 rcpt to:<defer_senders@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<delay_accept@y>
 rcpt to:<delay_warn@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<delay_accept@y>
 rcpt to:<delay_warn@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<host_check@y>
 rcpt to:<host_check@y>
 mail from:<x@y>
 rcpt to:<host_check@y>
 rcpt to:<host_check@y>


@@ -51,37 +61,44 @@ rcpt to:<host_check2@y>
 quit
 ****
 exim -bs -N -odi
 quit
 ****
 exim -bs -N -odi

+helo test

 mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 data
 mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 data

+

 Testing
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
 Testing
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data

+

 Testing 2
 .
 mail from:<x@y>
 rcpt to:<queue_only@y>
 rcpt to:<accept@y>
 data
 Testing 2
 .
 mail from:<x@y>
 rcpt to:<queue_only@y>
 rcpt to:<accept@y>
 data

+

 Testing 3
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
 Testing 3
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data

+

 Testing 4
 .
 quit
 ****
 exim -bh V4NET.9.8.7
 Testing 4
 .
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<nested_drop@y>
 rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<nested_drop@y>
 rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<nested_drop_require@y>
 rcpt to:<rhubarb@y>
 mail from:<x@y>
 rcpt to:<nested_drop_require@y>
 rcpt to:<rhubarb@y>


@@ -93,6 +110,8 @@ exim -DSERVER=server -odq -bd -oX PORT_D
 ****
 client -t5 127.0.0.1 PORT_D
 ??? 220
 ****
 client -t5 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y>
 ??? 250
 rcpt to:<accept@y>
 mail from:<x@y>
 ??? 250
 rcpt to:<accept@y>


@@ -101,6 +120,7 @@ rcpt to:<freeze@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing
 .
 ??? 250
 Testing
 .
 ??? 250


@@ -110,6 +130,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 2
 .
 ??? 250
 Testing 2
 .
 ??? 250


@@ -121,6 +142,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 3
 .
 ??? 250
 Testing 3
 .
 ??? 250


@@ -130,6 +152,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 4
 .
 ??? 250
 Testing 4
 .
 ??? 250