[Ltp-cvs] ltp/testcases/kernel/syscalls/swapon swapon03.c, 1.9, 1.10

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/swapon
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20214/testcases/kernel/syscalls/swapon

Modified Files:
	swapon03.c 
Log Message:
1. create_swapfile doesn't set errno to any usable value.
2. Provide better diagnostics for when mkswap fails.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: swapon03.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/swapon/swapon03.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** swapon03.c	26 Nov 2009 14:11:35 -0000	1.9
--- swapon03.c	31 Jan 2010 07:29:25 -0000	1.10
***************
*** 286,290 ****
  			/* Create the swapfile */
  			if (create_swapfile(filename, bs, count) < 0) {
! 				tst_brkm(TFAIL | TERRNO, cleanup,
  					 "Failed to create swapfile for the test");
  			}
--- 286,290 ----
  			/* Create the swapfile */
  			if (create_swapfile(filename, bs, count) < 0) {
! 				tst_brkm(TFAIL, cleanup,
  					 "Failed to create swapfile for the test");
  			}
***************
*** 347,351 ****
  	}
  	if (system(cmd_buffer) != 0) {
! 		tst_resm(TWARN, "failed to make swap file %s", swapfile);
  		return -1;
  	}
--- 347,352 ----
  	}
  	if (system(cmd_buffer) != 0) {
! 		tst_resm(TWARN, "failed to make swap file %s via command %s",
! 			 swapfile, cmd_buffer);
  		return -1;
  	}