Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 29 Apr 2003 19:57:56 -0000
Message-ID: <20030429195756.45348.qmail@icarus.apache.org>
From: jorton@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/test testuser.c

jorton      2003/04/29 12:57:56

  Modified:    test     testuser.c
  Log:
  Localize the fudge added in r1.10 to Win32, since it makes the test
  return NotImpl if run as root on Unix.
  
  Revision  Changes    Path
  1.12      +6 -0      apr/test/testuser.c
  
  Index: testuser.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testuser.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -u -r1.11 -r1.12
  --- testuser.c	1 Jan 2003 00:01:56 -0000	1.11
  +++ testuser.c	29 Apr 2003 19:57:56 -0000	1.12
  @@ -88,6 +88,9 @@
       CuAssertIntEquals(tc, APR_SUCCESS, rv);
   
       CuAssertIntEquals(tc, APR_SUCCESS, apr_uid_compare(uid, retreived_uid));
  +#ifdef WIN32
  +    /* ### this fudge was added for Win32 but makes the test return NotImpl
  +     * on Unix if run as root, when !gid is also true. */
       if (!gid || !retreived_gid) {
           /* The function had no way to recover the gid (this would have been
            * an ENOTIMPL if apr_uid_ functions didn't try to double-up and
  @@ -101,8 +104,11 @@
           }        
       }
       else {
  +#endif
           CuAssertIntEquals(tc, APR_SUCCESS, apr_gid_compare(gid, retreived_gid));
  +#ifdef WIN32
       }
  +#endif
   }
   
   static void groupname(CuTest *tc)