[Ltp-cvs] ltp/testcases/kernel/syscalls/capset capset01.c, 1.8, 1.9 capset02.c, 1.13, 1.14

[Mike F. <va...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/capset
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1517

Modified Files:
	capset01.c capset02.c 
Log Message:
cleanup printf strings and errno handling

Index: capset02.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/capset/capset02.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** capset02.c	23 Mar 2009 13:35:39 -0000	1.13
--- capset02.c	28 Aug 2009 11:27:51 -0000	1.14
***************
*** 166,173 ****
  					 " errno: %s", test_cases[i].errdesc);
  			} else {
! 				tst_resm(TFAIL, "Test Failed, capset()"
! 					 " returned %d, errno = %d : %s",
! 					 TEST_RETURN, TEST_ERRNO,
! 					 strerror(TEST_ERRNO));
  			}
  			TEST_ERROR_LOG(TEST_ERRNO);
--- 166,171 ----
  					 " errno: %s", test_cases[i].errdesc);
  			} else {
! 				tst_resm(TFAIL|TTERRNO, "Test Failed, capset() returned %ld",
! 					 TEST_RETURN);
  			}
  			TEST_ERROR_LOG(TEST_ERRNO);
***************
*** 201,205 ****
  	header.version = _LINUX_CAPABILITY_VERSION;
  	if ((capget(&header, &data)) == -1) {
! 		tst_brkm(TBROK, tst_exit, "capget() failed");
  	}
  
--- 199,203 ----
  	header.version = _LINUX_CAPABILITY_VERSION;
  	if ((capget(&header, &data)) == -1) {
! 		tst_brkm(TBROK|TERRNO, tst_exit, "capget() failed");
  	}
  
***************
*** 270,274 ****
  		switch (child_pid) {
  		case -1:
! 			tst_resm(TBROK, "fork() failed: %s", strerror(errno));
  			cleanup();
  			break;
--- 268,272 ----
  		switch (child_pid) {
  		case -1:
! 			tst_resm(TBROK|TERRNO, "fork() failed");
  			cleanup();
  			break;
***************
*** 289,294 ****
  			ltpuser = getpwnam(nobody_uid);
  			if (seteuid(ltpuser->pw_uid) == -1) {
! 				tst_resm(TBROK, "seteuid() failed: %s",
! 					 strerror(errno));
  				cleanup();
  			}
--- 287,291 ----
  			ltpuser = getpwnam(nobody_uid);
  			if (seteuid(ltpuser->pw_uid) == -1) {
! 				tst_resm(TBROK|TERRNO, "seteuid() failed");
  				cleanup();
  			}

Index: capset01.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/capset/capset01.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** capset01.c	23 Mar 2009 13:35:39 -0000	1.8
--- capset01.c	28 Aug 2009 11:27:51 -0000	1.9
***************
*** 121,131 ****
  
  		if (TEST_RETURN == 0) {
! 			tst_resm(TPASS, "capset() returned %d", TEST_RETURN);
  		} else {
! 			tst_resm(TFAIL, "Test Failed, capset()"
! 				 " returned %d, errno = %d : %s."
  				 " Maybe you need to do `modprobe capability`?",
! 				 TEST_RETURN, TEST_ERRNO, strerror(TEST_ERRNO)
! 			    );
  		}
  	}			/* End for TEST_LOOPING */
--- 121,129 ----
  
  		if (TEST_RETURN == 0) {
! 			tst_resm(TPASS, "capset() returned %ld", TEST_RETURN);
  		} else {
! 			tst_resm(TFAIL|TTERRNO, "Test Failed, capset() returned %ld"
  				 " Maybe you need to do `modprobe capability`?",
! 				 TEST_RETURN);
  		}
  	}			/* End for TEST_LOOPING */
***************
*** 154,158 ****
  	header.pid = 0;
  	if ((capget(&header, &data)) == -1) {
! 		tst_brkm(TBROK, tst_exit, "capget() failed");
  	}
  
--- 152,156 ----
  	header.pid = 0;
  	if ((capget(&header, &data)) == -1) {
! 		tst_brkm(TBROK|TTERRNO, tst_exit, "capget() failed");
  	}