[Ltp-cvs] ltp/testcases/kernel/syscalls/ftruncate ftruncate01.c, 1.7, 1.8 ftruncate02.c, 1.8, 1.9 f

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	ftruncate01.c ftruncate02.c ftruncate03.c ftruncate04.c 
Log Message:
fix/cleanup printf strings and errno handling

Index: ftruncate04.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ftruncate/ftruncate04.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ftruncate04.c	23 Mar 2009 13:35:41 -0000	1.17
--- ftruncate04.c	28 Aug 2009 13:00:33 -0000	1.18
***************
*** 64,67 ****
--- 64,68 ----
  #include <errno.h>
  #include <wait.h>
+ #include <inttypes.h>
  #include <sys/types.h>
  #include <sys/stat.h>
***************
*** 187,191 ****
  	if (sb.st_size != recstart + (RECLEN / 2)) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 4");
! 		tst_resm(TFAIL, "expected size of %d, got size of %d",
  			 recstart + (RECLEN / 2), sb.st_size);
  		local_flag = FAILED;
--- 188,192 ----
  	if (sb.st_size != recstart + (RECLEN / 2)) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 4");
! 		tst_resm(TFAIL, "expected size of %d, got size of %"PRId64,
  			 recstart + (RECLEN / 2), sb.st_size);
  		local_flag = FAILED;
***************
*** 211,216 ****
  	if (sb.st_size != RECLEN) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 5");
! 		tst_resm(TFAIL, "expected size of %d, got size of %d", RECLEN,
! 			 sb.st_size);
  		local_flag = FAILED;
  		cleanup();
--- 212,217 ----
  	if (sb.st_size != RECLEN) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 5");
! 		tst_resm(TFAIL, "expected size of %d, got size of %"PRId64,
! 			 RECLEN, sb.st_size);
  		local_flag = FAILED;
  		cleanup();
***************
*** 230,234 ****
  	if (sb.st_size != (2 * len)) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 6");
! 		tst_resm(TFAIL, "expected size of %d, got size of %d",
  			 (2 * len), sb.st_size);
  		local_flag = FAILED;
--- 231,235 ----
  	if (sb.st_size != (2 * len)) {
  		tst_resm(TFAIL, "unexpected ftruncate failure case 6");
! 		tst_resm(TFAIL, "expected size of %d, got size of %"PRId64,
  			 (2 * len), sb.st_size);
  		local_flag = FAILED;

Index: ftruncate01.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ftruncate/ftruncate01.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ftruncate01.c	23 Mar 2009 13:35:41 -0000	1.7
--- ftruncate01.c	28 Aug 2009 13:00:33 -0000	1.8
***************
*** 73,76 ****
--- 73,77 ----
  #include <string.h>
  #include <signal.h>
+ #include <inttypes.h>

  #include "test.h"
***************
*** 121,127 ****
  		/* check return code of ftruncate(2) */
  		if (TEST_RETURN == -1) {
! 			tst_resm(TFAIL,
! 				 "ftruncate() of %s Failed, errno=%d : %s",
! 				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
  			continue;
  		}
--- 122,126 ----
  		/* check return code of ftruncate(2) */
  		if (TEST_RETURN == -1) {
! 			tst_resm(TFAIL|TTERRNO, "ftruncate(%s) failed", TESTFILE);
  			continue;
  		}
***************
*** 148,152 ****
  			 */
  			if (file_length != TRUNC_LEN) {
! 				tst_resm(TFAIL, "%s: Incorrect file size %d, "
  					 "Expected %d", TESTFILE, file_length,
  					 TRUNC_LEN);
--- 147,151 ----
  			 */
  			if (file_length != TRUNC_LEN) {
! 				tst_resm(TFAIL, "%s: Incorrect file size %"PRId64", "
  					 "Expected %d", TESTFILE, file_length,
  					 TRUNC_LEN);
***************
*** 194,209 ****

  	/* open a file for reading/writing */
! 	if ((fildes = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
! 		tst_brkm(TBROK, cleanup,
! 			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
! 			 TESTFILE, FILE_MODE, errno, strerror(errno));
! 	}

  	/* Write to the file 1k data from the buffer */
  	while (c_total < FILE_SIZE) {
  		if ((c = write(fildes, tst_buff, sizeof(tst_buff))) <= 0) {
! 			tst_brkm(TBROK, cleanup,
! 				 "write(2) on %s Failed, errno=%d : %s",
! 				 TESTFILE, errno, strerror(errno));
  		} else {
  			c_total += c;
--- 193,206 ----

  	/* open a file for reading/writing */
! 	fildes = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
! 	if (fildes == -1)
! 		tst_brkm(TBROK|TERRNO, cleanup,
! 			 "open(%s, O_RDWR|O_CREAT, %o) failed",
! 			 TESTFILE, FILE_MODE);

  	/* Write to the file 1k data from the buffer */
  	while (c_total < FILE_SIZE) {
  		if ((c = write(fildes, tst_buff, sizeof(tst_buff))) <= 0) {
! 			tst_brkm(TBROK|TERRNO, cleanup, "write(%s) failed", TESTFILE);
  		} else {
  			c_total += c;
***************
*** 227,235 ****

  	/* Close the testfile after writing data into it */
! 	if (close(fildes) == -1) {
! 		tst_brkm(TFAIL, NULL,
! 			 "close(%s) Failed, errno=%d : %s",
! 			 TESTFILE, errno, strerror(errno));
! 	}

  	/* Remove tmp dir and all files in it */
--- 224,229 ----

  	/* Close the testfile after writing data into it */
! 	if (close(fildes) == -1)
! 		tst_brkm(TFAIL|TERRNO, NULL, "close(%s) failed", TESTFILE);

  	/* Remove tmp dir and all files in it */

Index: ftruncate03.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ftruncate/ftruncate03.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ftruncate03.c	23 Mar 2009 13:35:41 -0000	1.14
--- ftruncate03.c	28 Aug 2009 13:00:33 -0000	1.15
***************
*** 46,49 ****
--- 46,50 ----
  #include <errno.h>
  #include <string.h>
+ #include <inttypes.h>
  #include <sys/types.h>
  #include <sys/socket.h>
***************
*** 110,115 ****
  	wjh_f = open(TESTFILE, O_RDWR | O_CREAT, 0644);
  	if (wjh_f == -1) {
! 		tst_resm(TFAIL, "open(%s) failed: %s", TESTFILE,
! 			 strerror(errno));
  		tst_rmdir();
  		tst_exit();
--- 111,115 ----
  	wjh_f = open(TESTFILE, O_RDWR | O_CREAT, 0644);
  	if (wjh_f == -1) {
! 		tst_resm(TFAIL|TERRNO, "open(%s) failed", TESTFILE);
  		tst_rmdir();
  		tst_exit();
***************
*** 117,121 ****
  	while (count < strlen(str)) {
  		if ((count += write(wjh_f, str, strlen(str))) == -1) {
! 			tst_resm(TFAIL, "write() failed: %s", strerror(errno));
  			close(wjh_f);
  			tst_rmdir();
--- 117,121 ----
  	while (count < strlen(str)) {
  		if ((count += write(wjh_f, str, strlen(str))) == -1) {
! 			tst_resm(TFAIL|TERRNO, "write() failed");
  			close(wjh_f);
  			tst_rmdir();
***************
*** 136,141 ****
  	wjh_f = open(TESTFILE, flag);
  	if (wjh_f == -1) {
! 		tst_resm(TFAIL, "open(%s) failed: %s", TESTFILE,
! 			 strerror(errno));
  		tst_rmdir();
  		tst_exit();
--- 136,140 ----
  	wjh_f = open(TESTFILE, flag);
  	if (wjh_f == -1) {
! 		tst_resm(TFAIL|TERRNO, "open(%s) failed", TESTFILE);
  		tst_rmdir();
  		tst_exit();
***************
*** 152,159 ****
  			tst_resm(TPASS, "Test Succeeded!");
  		} else {
! 			tst_resm(TFAIL,
  				 "ftruncate(%s) should have succeeded, but didn't! ret="
! 				 "%d (wanted 0) errno(%d): %s\n", TESTFILE,
! 				 wjh_ret, errno, strerror(errno));
  		}
  	} else			//flag was O_RDONLY but return codes wrong
--- 151,157 ----
  			tst_resm(TPASS, "Test Succeeded!");
  		} else {
! 			tst_resm(TFAIL|TERRNO,
  				 "ftruncate(%s) should have succeeded, but didn't! ret="
! 				 "%d (wanted 0)", TESTFILE, wjh_ret);
  		}
  	} else			//flag was O_RDONLY but return codes wrong
***************
*** 180,186 ****
  #endif
  	if (wjh_ret != -1 || errno != EBADF) {
! 		tst_resm(TFAIL,
! 			 "ftruncate(invalid_fd)=%1 (wanted -1), errno=%i (wanted %i EBADF)",
! 			 wjh_ret, errno, EBADF);
  	} else {
  		tst_resm(TPASS, "Test Passed");
--- 178,184 ----
  #endif
  	if (wjh_ret != -1 || errno != EBADF) {
! 		tst_resm(TFAIL|TERRNO,
! 			 "ftruncate(invalid_fd)=%d (wanted -1 and EBADF)",
! 			 wjh_ret);
  	} else {
  		tst_resm(TPASS, "Test Passed");

Index: ftruncate02.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ftruncate/ftruncate02.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ftruncate02.c	23 Mar 2009 13:35:41 -0000	1.8
--- ftruncate02.c	28 Aug 2009 13:00:33 -0000	1.9
***************
*** 128,134 ****
  		/* check return code of ftruncate(2) */
  		if (TEST_RETURN == -1) {
! 			tst_resm(TFAIL, "ftruncate of %s to size %d Failed, "
! 				 "errno=%d : %s", TESTFILE, TRUNC_LEN1,
! 				 TEST_ERRNO, strerror(TEST_ERRNO));
  			continue;
  		}
--- 128,133 ----
  		/* check return code of ftruncate(2) */
  		if (TEST_RETURN == -1) {
! 			tst_resm(TFAIL|TTERRNO, "ftruncate(%s) to size %d failed",
! 				 TESTFILE, TRUNC_LEN1);
  			continue;
  		}
***************
*** 280,295 ****
  	}
  	/* open a file for reading/writing */
! 	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
  		tst_brkm(TBROK, cleanup,
! 			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
! 			 TESTFILE, FILE_MODE, errno, strerror(errno));
! 	}

  	/* Write to the file 1k data from the buffer */
  	while (write_len < FILE_SIZE) {
  		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
! 			tst_brkm(TBROK, cleanup,
! 				 "write(2) on %s Failed, errno=%d : %s",
! 				 TESTFILE, errno, strerror(errno));
  		} else {
  			write_len += wbytes;
--- 279,292 ----
  	}
  	/* open a file for reading/writing */
! 	fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
! 	if (fd == -1)
  		tst_brkm(TBROK, cleanup,
! 			 "open(%s, O_RDWR|O_CREAT, %o) failed",
! 			 TESTFILE, FILE_MODE);

  	/* Write to the file 1k data from the buffer */
  	while (write_len < FILE_SIZE) {
  		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
! 			tst_brkm(TBROK, cleanup, "write(%s) failed", TESTFILE);
  		} else {
  			write_len += wbytes;
***************
*** 313,320 ****

  	/* Close the testfile after writing data into it */
! 	if (close(fd) == -1) {
! 		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s",
! 			 TESTFILE, errno, strerror(errno));
! 	}

  	/* Remove tmp dir and all files in it */
--- 310,315 ----

  	/* Close the testfile after writing data into it */
! 	if (close(fd) == -1)
! 		tst_brkm(TFAIL|TERRNO, NULL, "close(%s) failed", TESTFILE);

  	/* Remove tmp dir and all files in it */

[Ltp-cvs] ltp/testcases/kernel/syscalls/ftruncate ftruncate01.c, 1.7, 1.8 ftruncate02.c, 1.8, 1.9 f

Testsuite to validate the reliability, robustness, stability of Linux.

[Ltp-cvs] ltp/testcases/kernel/syscalls/ftruncate ftruncate01.c, 1.7, 1.8 ftruncate02.c, 1.8, 1.9 ftruncate03.c, 1.14, 1.15 ftruncate04.c, 1.17, 1.18