diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-11-01 11:37:36 +0000 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-11-01 11:37:36 +0000 |
commit | 42ec98804ba4473673997d013f03309dc3e1972d (patch) | |
tree | fdff15c0a8a05ff1d1a3e2b6260f04e3fae187bb /test/runtest | |
parent | c1cc0506c3069a9d93d71321f9578150662ede91 (diff) |
Testsuite: tidying
Diffstat (limited to 'test/runtest')
-rwxr-xr-x | test/runtest | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index 8435fccfc..c6111678f 100755 --- a/test/runtest +++ b/test/runtest @@ -896,7 +896,7 @@ RESET_AFTER_EXTRA_LINE_READ: # As of Exim 4.74, we log when a setgid fails; because we invoke Exim # with -be, privileges will have been dropped, so this will always # be the case - next if /^changing group to \d+ failed: Operation not permitted/; + next if /^changing group to \d+ failed: (Operation not permitted|Not owner)/; # We might not keep this check; rather than change all the tests, just # ignore it as long as it succeeds; then we only need to change the @@ -1029,6 +1029,14 @@ RESET_AFTER_EXTRA_LINE_READ: next; } + # ======== log ======== + + elsif ($is_log) + { + # Berkeley DB version differences + next if / Berkeley DB error: /; + } + # ======== All files other than stderr ======== print MUNGED; @@ -2728,7 +2736,7 @@ $pwcomm = $pwcomm; $parm_caller_group = getgrgid($parm_caller_gid); -print "Program caller is $parm_caller, whose group is $parm_caller_group\n"; +print "Program caller is $parm_caller ($parm_caller_uid), whose group is $parm_caller_group ($parm_caller_gid)\n"; print "Home directory is $parm_caller_home\n"; unless (defined $parm_eximgroup) |