Utilities: fix exiqgrep perl syntax, add testcases. Bug 2821

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

diff --git a/test/scripts/0000-Basic/0066 b/test/scripts/0000-Basic/0066
index cb4492ed1e247d0f9daf0ddce417877baa2cdc7b..09db4f920dc10e33f77add6d6dacddf1e5864ad9 100644 (file)
--- a/test/scripts/0000-Basic/0066
+++ b/test/scripts/0000-Basic/0066
@@ -1,5 +1,6 @@
 # Relay by hostlist matching host or network
 exim -bh 1.2.3.4
 # Relay by hostlist matching host or network
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh 1.2.3.5
 quit
 ****
 exim -bh 1.2.3.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh 1.2.4.5
 quit
 ****
 exim -bh 1.2.4.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -24,6 +27,7 @@ data
 quit
 ****
 exim -bh 1.3.2.4
 quit
 ****
 exim -bh 1.3.2.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -32,6 +36,7 @@ data
 quit
 ****
 exim -bh 131.111.8.2
 quit
 ****
 exim -bh 131.111.8.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -40,6 +45,7 @@ data
 quit
 ****
 exim -bh 192.152.98.3
 quit
 ****
 exim -bh 192.152.98.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -48,6 +54,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.1
 quit
 ****
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -56,6 +63,7 @@ data
 quit
 ****
 exim -bh V4NET.11.12.13
 quit
 ****
 exim -bh V4NET.11.12.13

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -64,6 +72,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.3
 quit
 ****
 exim -bh V4NET.0.0.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>