Testsuite: Allow input lines starting with ":<cmd>:", like ":sleep:".

This somehow mimics the behaviour of the client tool, but works for
*any* input line that is sent to the application. This reverts the
unfortunate take abusing the client's special notation '>>> '.

Currently implemented:

        - :eval:
        - :neol:
        - :sleep:

8 files changed, 15 insertions, 15 deletions

diff --git a/test/scripts/0000-Basic/0100 b/test/scripts/0000-Basic/0100
index e31e9809d..7abf09143 100644
--- a/test/scripts/0000-Basic/0100
+++ b/test/scripts/0000-Basic/0100
@@ -78,7 +78,7 @@ exim -odi userx@test.ex <test-data
 ****
 exim -odi userx@test.ex
 Last line ending without a newline and with a partial match: 
->>> From
+:noeol:From
 ****
 exim -odi filter-userx@test.ex
 Test message
@@ -91,11 +91,11 @@ From: is how headers start
 ****
 exim -odi filter-userx@test.ex
 Last line ending without a newline and with a partial match: 
->>> From
+:noeol:From
 ****
 exim -odi userx@test.ex
 Last line ending without a newline and being a single dot:
->>> .
+:noeol:.
 ****
 exim -odi mmdf-userx@test.ex
 Line consisting of four ^A characters
diff --git a/test/scripts/0000-Basic/0101 b/test/scripts/0000-Basic/0101
index 512a60ea8..c3143eed7 100644
--- a/test/scripts/0000-Basic/0101
+++ b/test/scripts/0000-Basic/0101
@@ -61,7 +61,7 @@ exim -odi userx@test.ex <test-data
 ****
 exim -odi userx@test.ex
 Last line ending without a newline and with a partial match: 
->>> From
+:noeol:From
 ****
 exim -odi filter-userx@test.ex
 Test message
@@ -74,11 +74,11 @@ From: is how headers start
 ****
 exim -odi filter-userx@test.ex
 Last line ending without a newline and with a partial match: 
->>> From
+:noeol:From
 ****
 exim -odi userx@test.ex
 Last line ending without a newline and being a single dot:
->>> .
+:noeol:.
 ****
 exim -odi mmdf-userx@test.ex
 Line consisting of four ^A characters
diff --git a/test/scripts/0000-Basic/0242 b/test/scripts/0000-Basic/0242
index 995f5cc13..785e8e8a6 100644
--- a/test/scripts/0000-Basic/0242
+++ b/test/scripts/0000-Basic/0242
@@ -17,7 +17,7 @@ QUIT
 250 OK
 ****
 exim -odi abc@x.y.z
->>> Test message
+:noeol:Test message
 ****
 server PORT_S
 220 Server ready
@@ -35,5 +35,5 @@ QUIT
 250 OK
 ****
 exim -odi abc@x.y.z
->>> Subject: Test message
+:noeol:Subject: Test message
 ****
diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900
index af7840470..4503ae0c0 100644
--- a/test/scripts/0000-Basic/0900
+++ b/test/scripts/0000-Basic/0900
@@ -231,7 +231,7 @@ mail from:someone@some.domain
 rcpt to:CALLER@test.ex
 ??? 250
 bdat 87 last
-\>>> To: Susan@random.com\n
+>>> To: Susan@random.com\n
 From: Sam@random.com
 Subject: This is a Bodyless test message
 
diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901
index 10c582a17..f5a6fff9a 100644
--- a/test/scripts/0000-Basic/0901
+++ b/test/scripts/0000-Basic/0901
@@ -58,7 +58,7 @@ mail from:someone3@some.domain
 rcpt to:CALLER@test.ex
 ??? 250
 bdat 10
-\>>> To: Susan@
+>>> To: Susan@
 ??? 250
 bdat 78 last
 random.com
@@ -103,7 +103,7 @@ mail from:someone3A@some.domain
 rcpt to:CALLER@test.ex
 ??? 250
 bdat 10
-\>>> To: Susan@
+>>> To: Susan@
 ??? 250
 bdat 78 last
 random.com
diff --git a/test/scripts/1100-Basic-TLS/1101 b/test/scripts/1100-Basic-TLS/1101
index a1ed5a43b..41407e80b 100644
--- a/test/scripts/1100-Basic-TLS/1101
+++ b/test/scripts/1100-Basic-TLS/1101
@@ -10,7 +10,7 @@ STARTTLS
 ??? 220
 EHLO rhu.barb
 ????250
-\>>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n
+>>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n
 ??? 250 OK
 ??? 250 Accepted (rcpt via callout)
 QUIT
diff --git a/test/scripts/4030-proxy-protocol/4030 b/test/scripts/4030-proxy-protocol/4030
index 154e056d8..1eece1112 100644
--- a/test/scripts/4030-proxy-protocol/4030
+++ b/test/scripts/4030-proxy-protocol/4030
@@ -50,7 +50,7 @@ QUIT
 #
 # protocol v2 plain receive
 client HOSTIPV4 PORT_D
-\>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01
+>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01
 ??? 220
 HELO clientname
 ??? 250
diff --git a/test/scripts/4030-proxy-protocol/4031 b/test/scripts/4030-proxy-protocol/4031
index ecf3e827b..f3d2456ec 100644
--- a/test/scripts/4030-proxy-protocol/4031
+++ b/test/scripts/4030-proxy-protocol/4031
@@ -14,7 +14,7 @@ QUIT
 ****
 ### protocol v1 receive
 exim -bh HOSTIPV4
->>> PROXY TCP4 127.0.0.2 127.42.42.42 64000 25\r\n
+:eval:PROXY TCP4 127.0.0.2 127.42.42.42 64000 25\r\n
 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>
@@ -27,7 +27,7 @@ QUIT
 ****
 ### protocol v2 receive
 exim -bh HOSTIPV4
->>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01
+:eval:\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01
 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>