From 59620376be73c1ea2c73ccac5a0acff00a62cace Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 15 Dec 2019 20:21:50 +0000 Subject: [PATCH] Testsuite: tidying --- src/src/exim.c | 4 ++-- test/runtest | 4 +--- 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 ======== -- 2.25.1