Testsuite: reduce trailing 0372 subtest to queue-only

Suboptimal, but sufficient to regression-test the reason it was added (a live acl_m_
variable being store_reset over, after reception (and ACLs) and then referenced
later.  The problem was, child procs of the daemon were still running as the following
0373 started up, and left unexpected output files there.

(cherry picked from commit ea89f8337e9b47b7d9f986e07437a1002351855c)
Signed-off-by: Phil Pennock <pdp@exim.org>

diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372
index eee1851ffa3b8a30c247721fa658b766ac43a680..1bd39c758f3e6afb8837007e5f576f305ebb9c4e 100644 (file)
--- a/test/scripts/0000-Basic/0372
+++ b/test/scripts/0000-Basic/0372
@@ -18,7 +18,7 @@ data
 quit
 ****
 #
-exim -DSERVER=server -bd -oX PORT_D
+exim -DSERVER=server -bd -odq -oX PORT_D
 ****
 client 127.0.0.1 PORT_D
 ??? 220

diff --git a/test/stderr/0372 b/test/stderr/0372
index 6513fc2b68fc1c4c0a0106454ae3f38883f899c7..096049ec80fe4c4fbf774eaa8b10274af242adcb 100644 (file)
--- a/test/stderr/0372
+++ b/test/stderr/0372
@@ -124,33 +124,5 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 ----- System filter -----
 1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)
------ System filter -----
-  acl_c0="value for c0 is ip: 127.0.0.1"
-  acl_c1=""
-  acl_c2=""
-  acl_c3=""
-  acl_c4=""
-  acl_c5="c5 has a newline
-there!"
-  acl_c6=""
-  acl_c7=""
-  acl_c8=""
-  acl_c9="value for c9 is name: localhost"
-  acl_m0="value for m0 is local_part: x"
-  acl_m1=""
-  acl_m2=""
-  acl_m3=""
-  acl_m4=""
-  acl_m5="value for m5 contains newline
-there!"
-  acl_m6=""
-  acl_m7=""
-  acl_m8=""
-  acl_m9="value for m9 is domain: y"
-  acl_m_foo="value for mfoo is local_part: x"
-  acl_m_bar="value for mbar is domain: y"
-  acl_c_foo="value for c_foo is ip: 127.0.0.1"
-  acl_c_bar="value for c_bar is name: localhost"
--------------------------
 
 ******** SERVER ********