Merge branch 'master' of git://git.exim.org/eximexim-4_82_RC5

3 files changed, 12 insertions, 6 deletions

diff --git a/test/README b/test/README
index c64b02206..903c8abee 100644
--- a/test/README
+++ b/test/README
@@ -91,9 +91,10 @@ In order to run this test suite, the following requirements must be met:
 (5) Exim must be built with its user and group specified at build time, and
     with certain minimum facilities, namely:
 
-      Routers:    accept, dnslookup, manualroute, redirect
-      Transports: appendfile, autoreply, pipe, smtp
-      Lookups:    lsearch
+      Routers:        accept, dnslookup, manualroute, redirect
+      Transports:     appendfile, autoreply, pipe, smtp
+      Lookups:        lsearch
+      Authenticators: plaintext
 
     Most Exim binaries will have these included.
 
@@ -457,6 +458,9 @@ OTHER ISSUES
   be on by default and you'll see this problem, so make sure your umask is
   022 and re-checkout the test/ subdirectory.
 
+. Some tests will fail if the username and group name are different. It does
+  not have to be the primary group, a secondary group is sufficient.
+
 
 OTHER SCRIPTS AND PROGRAMS
 --------------------------
diff --git a/test/confs/0533 b/test/confs/0533
index 941994396..c43b628ee 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -28,6 +28,7 @@ r2:
   driver = redirect
   local_part_prefix = pipe-
   local_part_suffix = =*
+  caseful_local_part = true
   data = |${substr_1:$local_part_suffix}
   pipe_transport = t2
 
diff --git a/test/runtest b/test/runtest
index 6623d3b4b..443d7fcf4 100755
--- a/test/runtest
+++ b/test/runtest
@@ -193,7 +193,8 @@ close(T);
 system("sudo /bin/rm -rf ./spool test-* ./dnszones/*")
   if ($rc == 0 && !$save_output);
 
-system("sudo /bin/rm -rf ./eximdir/*");
+system("sudo /bin/rm -rf ./eximdir/*")
+  if (!$save_output);
 
 print "\nYou were in test $test at the end there.\n\n" if defined $test;
 exit $rc if ($rc >= 0);
@@ -1083,7 +1084,7 @@ if (! -e $sf)
   for (;;)
     {
     print "Continue, Show, or Quit? [Q] ";
-    $_ = <T>;
+    $_ = $force_continue ? "c" : <T>;
     tests_exit(1) if /^q?$/i;
     log_failure($log_failed_filename, $testno, $rf) if (/^c$/i && $force_continue);
     return 0 if /^c$/i;
@@ -3252,7 +3253,7 @@ closedir(DIR);
 open(T, "/dev/tty") || tests_exit(-1, "Failed to open /dev/tty: $!");
 
 print "\nPress RETURN to run the tests: ";
-$_ = <T>;
+$_ = $force_continue ? "c" : <T>;
 print "\n";
 
 $lasttestdir = "";