From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 11 Jan 2016 14:25:02 +0000 (+0000)
Subject: Testsuite: split out conf for -bP test and lose dependency on Proxy/Socks
X-Git-Tag: exim-4_87_RC3~16
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=71fe7747abbcdac393e93bbc0d84d94149f54aa0;p=exim.git

Testsuite: split out conf for -bP test and lose dependency on Proxy/Socks
---

diff --git a/test/confs/0572 b/test/confs/0572
deleted file mode 120000
index 4af051ca9..000000000
--- a/test/confs/0572
+++ /dev/null
@@ -1 +0,0 @@
-4020
\ No newline at end of file
diff --git a/test/confs/0572 b/test/confs/0572
new file mode 100644
index 000000000..2cce49c38
--- /dev/null
+++ b/test/confs/0572
@@ -0,0 +1,47 @@
+# Exim test configuration 0572
+
+OPT =
+
+exim_path = EXIM_PATH
+hide host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+tls_advertise_hosts =
+
+# ----- Main settings -----
+
+log_selector = +outgoing_port
+
+domainlist local_domains = test.ex : *.test.ex
+acl_smtp_rcpt = accept
+
+
+# ----- Routers -----
+
+begin routers
+
+my_main_router:
+  driver = manualroute
+  route_list = * 127.0.0.1
+  self = send
+  transport = my_smtp
+  debug_print = router_name <$router_name>
+  no_more
+
+
+# ----- Transports -----
+
+begin transports
+
+my_smtp:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+  hide socks_proxy = 127.0.0.1 port=PORT_D OPT
+  debug_print = transport_name <$transport_name>
+
+
+# End
diff --git a/test/stdout/0572 b/test/stdout/0572
index 87a02d3ed..bd537bc44 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -107,7 +107,7 @@ log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =
-log_selector = +proxy +outgoing_port
+log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept