testsuite: abstract out common conf settings

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

diff --git a/test/confs/0139 b/test/confs/0139
index 2f844b5f019513dfd0fb436ffd3fd1b89fd40298..eb3990c7281c54c2430ef748435d265e87e26c9a 100644 (file)
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,12 +1,7 @@
 # Exim test configuration 0139
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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
+
 
 # ----- Main settings -----
 
@@ -41,9 +36,9 @@ check_mail:
   warn    dnslists = rbl4.test.ex&0.0.0.6
   warn    dnslists = rbl4.test.ex&127.0.0.3
   warn    dnslists = rbl4.test.ex!&0.0.0.7
-          add_header = DNSlist: $dnslist_domain $dnslist_text
+          add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
   warn    dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
-          add_header = DNSlist: $dnslist_domain $dnslist_text
+          add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
   accept
 
 check_recipient: