diff options
| author | John Jetmore <jj33@pobox.com> | 2010-06-05 02:25:16 +0000 |
|---|---|---|
| committer | John Jetmore <jj33@pobox.com> | 2010-06-05 02:25:16 +0000 |
| commit | eeeda78a3b06864a1641ce9b7260d4acdb5ee78e (patch) | |
| tree | 74dee0bc9eb239894050440cf7c9f12b579955bd | |
| parent | 37acd760db257c134df6dad0fbb730b24b4b7e19 (diff) | |
munge caller's GECOS in output to make more portable across test accounts
| -rwxr-xr-x | test/runtest | 9 | ||||
| -rw-r--r-- | test/stderr/0563 | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/test/runtest b/test/runtest index 9d034169c..8a2b1d32b 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.35 2010/06/05 01:58:39 jetmore Exp $ +# $Cambridge: exim/test/runtest,v 1.36 2010/06/05 02:25:16 jetmore Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -441,7 +441,7 @@ while(<IN>) \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x; - # ======== Caller's login, uid, gid, home ======== + # ======== Caller's login, uid, gid, home, gecos ======== s/\Q$parm_caller_home\E/CALLER_HOME/g; # NOTE: these must be done s/\b\Q$parm_caller\E\b/CALLER/g; # in this order! @@ -453,6 +453,8 @@ while(<IN>) s/\buid=$parm_caller_uid\b/uid=CALLER_UID/g; s/\bgid=$parm_caller_gid\b/gid=CALLER_GID/g; + s/\bname=$parm_caller_gecos\b/name=CALLER_GECOS/g; + # When looking at spool files with -Mvh, we will find not only the caller # login, but also the uid and gid. It seems that $) in some Perls gives all # the auxiliary gids as well, so don't bother checking for that. @@ -2367,12 +2369,11 @@ if (defined $parm_support{'Expand_dlfunc'} && !-e "bin/loaded") # Find the caller of this program. ($parm_caller,$pwpw,$parm_caller_uid,$parm_caller_gid,$pwquota,$pwcomm, - $pwgecos, $parm_caller_home) = getpwuid($>); + $parm_caller_gecos, $parm_caller_home) = getpwuid($>); $pwpw = $pwpw; # Kill Perl warnings $pwquota = $pwquota; $pwcomm = $pwcomm; -$pwgecos = $pwgecos; $parm_caller_group = getgrgid($parm_caller_gid); diff --git a/test/stderr/0563 b/test/stderr/0563 index dbbe4e08d..29de6a32e 100644 --- a/test/stderr/0563 +++ b/test/stderr/0563 @@ -5,7 +5,7 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=Exim Test Suite +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS sender address = CALLER@testexim.test.ex Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> |