Testsuite: track newer GnuTLS behaviour

[exim.git] / test / confs / 0616

diff --git a/test/confs/0616 b/test/confs/0616
index 7962d97344c6ded372fc7e3e45062d8b0e184497..e710a4bc5a35fbbd6743790a502c6d1cf6b0db61 100644 (file)
--- a/test/confs/0616
+++ b/test/confs/0616
@@ -1,8 +1,40 @@
-# exim test configuration 0616
-exim_path = EXIM_PATH
-keep_environment = ^FOO\d : BAR
-add_environment = ADDED1=added1 : ADDED2=added2
-tls_advertise_hosts =
-perl_startup = $| = 1; \
-       print "Environment visible in Perl:\n"; \
-       print map { "$_=$ENV{$_}\n" } sort keys %ENV;
+# Exim test configuration 0616
+
+.include DIR/aux-var/std_conf_prefix
+
+# ----- Routers -----
+
+begin routers
+
+route_userx:
+  driver = redirect
+  local_parts = userx
+  errors_to = dump@domain1
+  allow_filter
+  file = DIR/aux-fixed/TESTNUM.filter
+  user = EXIMUSER
+  no_more
+
+dump_bounces:
+  driver = redirect
+  local_parts = dump
+  data = :blackhole:
+  no_more
+
+route_smtp:
+  driver = manualroute
+  route_list = * 127.0.0.1 byname
+  errors_to = dump@domain1
+  self = send
+  transport = smtp
+  no_more
+
+# ----- Transports -----
+
+begin transports
+
+smtp:
+  driver = smtp
+  port = PORT_S
+
+# End