Testsuite: tidying

diff --git a/src/src/exim.c b/src/src/exim.c
index f0feaf5bd43eb8575113b21c177f63ae29498abe..81b7bdc9f48686dda5616fccffee9b5677f06674 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -4293,8 +4293,8 @@ else
     if (!(unprivileged || removed_privilege))
       exim_fail("exim: changing group failed: %s\n", strerror(errno));
     else
     if (!(unprivileged || removed_privilege))
       exim_fail("exim: changing group failed: %s\n", strerror(errno));
     else

-      DEBUG(D_any) debug_printf("changing group to %ld failed: %d: %s\n",
-          (long int)exim_gid, errno, strerror(errno));
+      DEBUG(D_any) debug_printf("changing group to %ld failed: %s\n",
+          (long int)exim_gid, strerror(errno));

   }
 
 /* Handle a request to scan a file for malware */
   }
 
 /* Handle a request to scan a file for malware */

diff --git a/test/runtest b/test/runtest
index 14601c671eff9135995f7bbd64f9067b5089dff4..3c16a1e465a5e13a14deebee59d90d81315dd850 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -943,9 +943,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   # at least we'll still be checking the number of open fd's.
 
   s/max fd = \d+/max fd = dddd/;
   # at least we'll still be checking the number of open fd's.
 
   s/max fd = \d+/max fd = dddd/;

-  s/status=0 RDONLY/STATUS/g;
-  s/status=1 WRONLY/STATUS/g;
-  s/status=2 RDWR/STATUS/g;
+  s/status=[0-9a-f]+ (?:RDONLY|WRONLY|RDWR)/STATUS/g;

 
 
   # ======== Contents of spool files ========
 
 
   # ======== Contents of spool files ========