Testsuite: fix 0173 + 2100+, take 2

[users/heiko/exim.git] / test / confs / 0290

diff --git a/test/confs/0290 b/test/confs/0290
index 929a907408f2a3d2a3c04ddb266d6e88e6fa459f..5ccb8451f9bba7cadcd5cc388401f19f76665295 100644 (file)
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -3,27 +3,22 @@
 FOOBAR=
 FOO=inc1
 BAR=.include "DIR/aux-fixed/TESTNUM.inc2"
 FOOBAR=
 FOO=inc1
 BAR=.include "DIR/aux-fixed/TESTNUM.inc2"

-RT = receive_timeout = 1s
+OPT = receive_timeout = 1s

 INC=
 
 C1=#
 C2=#
 C1C2 this should be a comment
 
 INC=
 
 C1=#
 C2=#
 C1C2 this should be a comment
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 trusted_users = CALLER
 trusted_users = CALLER

+primary_hostname = myhost.test.ex

 
 # ----- Main settings -----
 
 FOOBAR  .include DIR/aux-fixed/TESTNUM.FOO
 
 # ----- Main settings -----
 
 FOOBAR  .include DIR/aux-fixed/TESTNUM.FOO

-RT
+OPT

 INC
 
 remote_sort_domains = a:b:c
 INC
 
 remote_sort_domains = a:b:c