Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0624 b/test/scripts/0000-Basic/0624
index 3715b125f27640e506064438ec8b6a3a52e7d2d3..0c3db409d8da898d977be85ba59c967a7dac9288 100644 (file)
--- a/test/scripts/0000-Basic/0624
+++ b/test/scripts/0000-Basic/0624
@@ -1,69 +1,10 @@
-# domainlist match values
+# multiple listener sockets ready

 #
 #

-exim -bs -DOPT=:
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@notmatched.ex>
-QUIT
+exim -bd -DSERVER=server -oX '<, PORT_D,PORT_D2'

 ****
 ****

-#
-exim -bs '-DOPT=notthis : plainstring.ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@plainstring.ex>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : *tail.ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@headtail.ex>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@headregextail.ex>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : @ : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@primaryhostname.ex>
-QUIT
-****
-#
-#
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@[127.0.0.1]>
-QUIT
-****
-#
-# malformed
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@127.0.0.1]>
-QUIT
-****
-#
-# malformed
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@[127.0.0.1>
-QUIT
-****
-#
-#
-exim -bs '-DOPT=notthis : @mx_any/ignore=1.1.1.1 : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@mx46.test.ex>
-QUIT
+exim a@test.ex b@test.ex c@test.ex
+Subject: test mail

 ****
 #
 ****
 #

+sleep 8
+killdaemon