Remove confusing #ifndef environ

[users/jgh/exim.git] / test / scripts / 4000-scanning / 4009

diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009
index 50f5ff990afbfff086670f6ae720f3b1e01a2df4..df9cc178e0fd23ecd6d706b0945238402773bdab 100644 (file)
--- a/test/scripts/4000-scanning/4009
+++ b/test/scripts/4000-scanning/4009
@@ -1,5 +1,10 @@
 # content scan interface: spamassassin
 #
+# The spooled file for scanning includes the test-runner's user name
+# hence size varies.  Munge that.
+munge scanfile_size
+#
+#
 # A good-comms test, returning not-spam.
 # (we could use a second one that returns is-spam...)
 server 7833
@@ -222,7 +227,7 @@ server 7833
 >
 *eof
 ****
-exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s'
+exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; HOSTIPV4 7834 pri=2 tmo=2s'
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>