diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-07-04 10:37:03 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-07-04 10:37:03 +0000 |
| commit | a4dc33a8a400a90d4d73aeb79fd9809a14e5795c (patch) | |
| tree | ffa7647def445a429d567651c3d0f58e4a3fbe20 /test | |
| parent | 1f5497b2a08c38975c9945122a0279bb03f99e28 (diff) | |
Remove unwanted (int) case when reading SIZE. Fix runtest for 64-bit
systems. Tidy obsolete stuff in test 46.
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-fixed/0046.filter.userx | 4 | ||||
| -rw-r--r-- | test/confs/0046 | 6 | ||||
| -rwxr-xr-x | test/runtest | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/test/aux-fixed/0046.filter.userx b/test/aux-fixed/0046.filter.userx deleted file mode 100644 index c0044c993..000000000 --- a/test/aux-fixed/0046.filter.userx +++ /dev/null @@ -1,4 +0,0 @@ -# Exim filter - -testprint "Body: $message_body" -testprint "End: $message_body_end" diff --git a/test/confs/0046 b/test/confs/0046 index 554366907..ab285012d 100644 --- a/test/confs/0046 +++ b/test/confs/0046 @@ -21,12 +21,6 @@ trusted_users = CALLER begin routers -forwardfile: - driver = redirect - allow_filter - check_local_user - file = DIR/aux-fixed/TESTNUM.filter.$local_part - localuser: driver = accept local_parts = userx diff --git a/test/runtest b/test/runtest index aba266292..6a4fb2b51 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.27 2007/06/14 13:20:38 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.28 2007/07/04 10:37:04 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -490,6 +490,12 @@ while(<IN>) # ======== General uids, gids, and pids ======== # Note: this must come after munges for caller's and exim's uid/gid + # These are for systems where long int is 64 + s/\buid=4294967295/uid=-1/; + s/\beuid=4294967295/euid=-1/; + s/\bgid=4294967295/gid=-1/; + s/\begid=4294967295/egid=-1/; + s/\bgid=\d+/gid=gggg/; s/\begid=\d+/egid=gggg/; s/\bpid=\d+/pid=pppp/; |