Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0603 b/test/scripts/0000-Basic/0603
index 38e374a1f91104bd431b5622598251f043668867..dfe53ef8c220614c419632e6b59c746a208282e3 100644 (file)
--- a/test/scripts/0000-Basic/0603
+++ b/test/scripts/0000-Basic/0603
@@ -1,71 +1,10 @@
-# retry: transport identity depending on sender
-# Exim test configuration 0603
+# log_defer_output on pipe transport

 #
 #

-# Add several messages going to the same location
-# And change smtp output based on senders domain
+#XXX maybe collapse into 0048?

 #
 #

-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-exim -bs
-mail from:ralph@dustyshoes.tld
-rcpt to:bob@anotherone.tld
-data
-This is a test message.
-It has three lines.
-This is the last line.
-.
-RSET
-mail from:peter@dustybelt.tld
-rcpt to:bob@anotherone.tld
-data
-Subject: second
-
-This is a second test message.
-.
-RSET
-mail from:ralph@dustyshoes.tld
-rcpt to:bob@anotherone.tld
-data
-Subject: third
-Reply-to: some@body
-
-This is a third test message.
-.
-RSET
-mail from:peter@dustybelt.tld
-rcpt to:bob@anotherone.tld
-data
-Subject: secondA
-
-This is a secondA test message.
-.
-RSET
-mail from:ralph@dustyshoes.tld
-rcpt to:bob@anotherone.tld
-data
-Subject: third
-Reply-to: some@body
-
-This is a fourth test message.
-.
-RSET
-mail from:ralph@dustyshoes.tld
-rcpt to:bob@anotherone.tld
-data
-Subject: third
-Reply-to: some@body
-
-This is a fifth test message.
-.
-quit
-****
+munge sys_bindir

 #
 #

-#
-exim -qq
+exim a

 ****
 ****

-#
-#
-killdaemon
+sleep 2

 no_msglog_check
 no_msglog_check

-