[Ltp-cvs] ltp/testcases/kernel/mem/hugetlb/hugeshmctl hugeshmctl02.c,1.1,1.2

[Robert W. <ro...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/mem/hugetlb/hugeshmctl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13247

Modified Files:
	hugeshmctl02.c 
Log Message:
Removed the tests that required non-root, b/c shared memory calls using
hugetlb require root id.


Index: hugeshmctl02.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hugeshmctl02.c	15 Apr 2004 22:36:46 -0000	1.1
--- hugeshmctl02.c	28 Apr 2004 16:00:51 -0000	1.2
***************
*** 57,61 ****
  
  char *TCID = "hugeshmctl02";
! int TST_TOTAL = 7;
  extern int Tst_count;
  char nobody_uid[] = "nobody";
--- 57,61 ----
  
  char *TCID = "hugeshmctl02";
! int TST_TOTAL = 4;
  extern int Tst_count;
  char nobody_uid[] = "nobody";
***************
*** 76,82 ****
  	int error;
  } TC[] = {
- 	/* EACCES - segment has no read or write permissions */
- 	{&shm_id_1, IPC_STAT, &buf, EACCES},
- 
  	/* EFAULT - IPC_SET & buf isn't valid */
  	{&shm_id_2, IPC_SET, (struct shmid_ds *)-1, EFAULT},
--- 76,79 ----
***************
*** 90,99 ****
  	/* EINVAL - the command is not valid */
  	{&shm_id_2, -1, &buf, EINVAL},
- 
- 	/* EPERM - the command is only valid for the super-user */
- 	{&shm_id_2, SHM_LOCK, &buf, EPERM},
- 
- 	/* EPERM - the command is only valid for the super-user */
- 	{&shm_id_2, SHM_UNLOCK, &buf, EPERM}
  };
  
--- 87,90 ----
***************
*** 137,147 ****
  					 strerror(TEST_ERRNO));
  			} else {
! 				if (i >= 5)
! 					tst_resm(TCONF,"shmctl() did not fail for non-root user."
!                                                  "This may be okay for your distribution.");
! 				else
! 					tst_resm(TFAIL, "call failed with an "
! 						 "unexpected error - %d : %s",
! 					 	TEST_ERRNO, strerror(TEST_ERRNO));
  			}			
  		}
--- 128,134 ----
  					 strerror(TEST_ERRNO));
  			} else {
! 				tst_resm(TFAIL, "call failed with an "
! 					 "unexpected error - %d : %s",
! 				 	TEST_ERRNO, strerror(TEST_ERRNO));
  			}			
  		}
***************
*** 160,176 ****
  setup(void)
  {
- 	/* Switch to nobody user for correct error code collection */
-         if (geteuid() != 0) {
-                 tst_brkm(TBROK, tst_exit, "Test must be run as root");
-         }
-          ltpuser = getpwnam(nobody_uid);
-          if (setuid(ltpuser->pw_uid) == -1) {
-                 tst_resm(TINFO, "setuid failed to "
-                          "to set the effective uid to %d",
-                          ltpuser->pw_uid);
-                 perror("setuid");
-          }
- 
- 
  	/* capture signals */
  	tst_sig(NOFORK, DEF_HANDLER, cleanup);
--- 147,150 ----