Testsuite: case should not depend on build-option

diff --git a/test/confs/0572 b/test/confs/0572
index 2cce49c3856e3295d77fad37682529429557c1c0..f09e52177a1f75a0c5409f5c98413822bc12fdea 100644 (file)
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -28,7 +28,7 @@ my_main_router:
   route_list = * 127.0.0.1
   self = send
   transport = my_smtp
-  debug_print = router_name <$router_name>
+  hide debug_print = router_name <$router_name>
   no_more
 
 
@@ -40,7 +40,6 @@ 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>
 
 

diff --git a/test/runtest b/test/runtest
index 914af5e4103fbcded57e4a9eaed819c643fa5e5f..face0dd45c5b23f9d693ad0e86466fa107b55aef 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1393,12 +1393,13 @@ $munges =
     { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
     },
 
-    'optional_nossl' =>
+    'optional_config' =>
     { 'stdout' => '/^(
                   dkim_(canon|domain|private_key|selector|sign_headers|strict)
                   |gnutls_require_(kx|mac|protocols)
                   |hosts_(requ(est|ire)|try)_(dane|ocsp)
                   |hosts_(avoid|nopass|require|verify_avoid)_tls
+                  |socks_proxy
                   |tls_[^ ]*
                   )($|[ ]=)/x' },
 

diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572
index 05ba658f7e9f373d4ab25c5b142016a262e76c85..ae31ea027cee329093b7d14011740b2d2c4f0507 100644 (file)
--- a/test/scripts/0000-Basic/0572
+++ b/test/scripts/0000-Basic/0572
@@ -3,7 +3,7 @@
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #
-munge optional_nossl
+munge optional_config
 exim -bP spool_directory
 ****
 perl -e 'print "\n";'

diff --git a/test/stdout/0572 b/test/stdout/0572
index 240a2332a0d64fc8196ae3bbfc9c5ee6a20732fb..40397afa515e5f97e3b0d6cd53e703695b91f907 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -68,7 +68,6 @@ protocol = smtp
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
-socks_proxy = 127.0.0.1 port=1225
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
@@ -91,7 +90,7 @@ begin routers
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp
-    debug_print = router_name <$router_name>
+    hide debug_print = router_name <$router_name>
     no_more
 
 begin transports
@@ -100,5 +99,4 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
-    hide socks_proxy = 127.0.0.1 port=1225
     debug_print = transport_name <$transport_name>