summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-12-15 20:21:50 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2019-12-15 21:42:23 +0000
commit59620376be73c1ea2c73ccac5a0acff00a62cace (patch)
tree5d08d6cb4734c7293e99caabcc41992e835b7092
parent25ef0f44a4d150d8a3571906475ed3d567ee7f4a (diff)
Testsuite: tidying
-rw-r--r--src/src/exim.c4
-rwxr-xr-xtest/runtest4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/src/exim.c b/src/src/exim.c
index f0feaf5bd..81b7bdc9f 100644
--- 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
- 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 */
diff --git a/test/runtest b/test/runtest
index 14601c671..3c16a1e46 100755
--- 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/;
- 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 ========