[Ltp-cvs] ltp/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit ext4_subdir_limit_test.sh, 1.1, 1.2

[Subrata <sub...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22285/ltp/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit

Modified Files:
	ext4_subdir_limit_test.sh 
Log Message:
The following is changelog. This patch can fix the following problem:
-- delete the code of setting the test_fs flag
-- open the verbose mode of e4defrag, it is useful to find the problem of online defrag
-- fix some bug of the Makefile
-- throw the utilities version info away
-- delete two unnecessary testcases about ext4 subdir limit test
Signed-off-by: Miao Xie <mi...@cn...>,


Index: ext4_subdir_limit_test.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/ext4_subdir_limit_test.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ext4_subdir_limit_test.sh	26 Oct 2009 11:25:55 -0000	1.1
--- ext4_subdir_limit_test.sh	9 Dec 2009 12:02:24 -0000	1.2
***************
*** 29,33 ****
  
  export TCID="ext4-subdir-limit"
! export TST_TOTAL=12
  export TST_COUNT=1
  
--- 29,33 ----
  
  export TCID="ext4-subdir-limit"
! export TST_TOTAL=10
  export TST_COUNT=1
  
***************
*** 60,70 ****
  	fi
  
! 	tst_resm TINFO "Num of dirs to create: $1, Dir name len: $dir_name_len \
! 			Parent dir: $3, Block size: $4"
  
  	# only mkfs if block size has been changed,
  	# or previous case failed
  	if [ $prev_result -ne $PASS -o $4 -ne $prev_block_size ]; then
! 		mkfs.ext4 -b $4 -I 256 $EXT4_DEV > /dev/null
  		if [ $? -ne 0 ]; then
  			tst_resm TFAIL "failed to create ext4 filesystem"
--- 60,70 ----
  	fi
  
! 	tst_resm TINFO "Num of dirs to create: $1, Dir name len: $dir_name_len, " \
! 			"Parent dir: $3, Block size: $4"
  
  	# only mkfs if block size has been changed,
  	# or previous case failed
  	if [ $prev_result -ne $PASS -o $4 -ne $prev_block_size ]; then
! 		mkfs.ext4 -b $4 -I 256 $EXT4_DEV &> /dev/null
  		if [ $? -ne 0 ]; then
  			tst_resm TFAIL "failed to create ext4 filesystem"
***************
*** 73,77 ****
  		prev_block_size=$4
  
! 		tune2fs -E test_fs -O extents $EXT4_DEV
  	fi
  
--- 73,77 ----
  		prev_block_size=$4
  
! 		tune2fs -O extents $EXT4_DEV &> /dev/null
  	fi
  
***************
*** 121,125 ****
  
  	# run fsck to make sure the filesystem has no errors
! 	e2fsck -p $EXT4_DEV
  	if [ $? -ne 0 ]; then
  		tst_resm TFAIL "fsck: the filesystem has errors"
--- 121,125 ----
  
  	# run fsck to make sure the filesystem has no errors
! 	e2fsck -p $EXT4_DEV &> /dev/null
  	if [ $? -ne 0 ]; then
  		tst_resm TFAIL "fsck: the filesystem has errors"
***************
*** 128,132 ****
  
  	# check dir_nlink is set
! 	dumpe2fs $EXT4_DEV | grep '^Filesystem features' | grep -q dir_nlink
  	if [ $? -ne 0 ]; then
  		tst_resm TFAIL "feature dir_nlink is not set"
--- 128,132 ----
  
  	# check dir_nlink is set
! 	dumpe2fs $EXT4_DEV 2> /dev/null | grep '^Filesystem features' | grep -q dir_nlink
  	if [ $? -ne 0 ]; then
  		tst_resm TFAIL "feature dir_nlink is not set"
***************
*** 153,156 ****
--- 153,159 ----
  		for ((k = 0; k < 2; k++))
  		{
+ 			if [ $i -eq $LONG_DIR -a $k -eq 1024 ]; then
+ 				continue
+ 			fi
  			ext4_run_case 65537 ${DIR_LEN[$k]} ${PARENT_DIR[$j]} \
  					${BLOCK_SIZE[$i]}