[LTP] [PATCH v2] fs/ext4-new-features: fix wrong test point when running ext4-persist-prealloc

[LTP] [PATCH v2] fs/ext4-new-features: fix wrong test point when running ext4-persist-prealloc

[Xiaoguang Wang]

ext4-persist-prealloc test will call test cases under 'testcases/kernel/syscalls
/fallocate' to have persist prealloc test for ext4 filesystem. But currently
fallocate[0-3] cases will have tests in a different filesystem, which the directory
created by tst_tmpdir() is in. This is wrong, fix it.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 .../ext4-persist-prealloc/ext4_persist_prealloc_test.sh              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
index 20b66f8..d577bb5 100755
--- a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
+++ b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
@@ -46,6 +46,7 @@ ext4_test_persist_prealloc()
 
 	ret=1
 
+	temp_tmpdir=$TMPDIR
 	for ((i = 1; i <= 3; i++))
 	{
 		if ! command -v fallocate0${i} > /dev/null 2>&1; then
@@ -56,13 +57,15 @@ ext4_test_persist_prealloc()
 			return
 		fi
 
-		fallocate0${i} | grep -q "CONF"
+		TMPDIR=mnt_point; fallocate0${i} | grep -q "CONF"
 		if [ $? -ne $ret ]; then
 			tst_resm TFAIL "fallocate's return value is not expected"
 			umount mnt_point
+			TMPDIR=$temp_tmpdir
 			return
 		fi
 	}
+	TMPDIR=$temp_tmpdir
 
 	umount mnt_point
 	if [ $? -ne 0 ]; then
-- 
1.8.2.1


------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] fs/ext4-new-features: fix wrong test point when running ext4-persist-prealloc

[chrubis]

Hi!
> ext4-persist-prealloc test will call test cases under 'testcases/kernel/syscalls
> /fallocate' to have persist prealloc test for ext4 filesystem. But currently
> fallocate[0-3] cases will have tests in a different filesystem, which the directory
> created by tst_tmpdir() is in. This is wrong, fix it.
> 
> Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
> ---
>  .../ext4-persist-prealloc/ext4_persist_prealloc_test.sh              | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
> index 20b66f8..d577bb5 100755
> --- a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
> +++ b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
> @@ -46,6 +46,7 @@ ext4_test_persist_prealloc()
>  
>  	ret=1
>  
> +	temp_tmpdir=$TMPDIR
>  	for ((i = 1; i <= 3; i++))
>  	{
>  		if ! command -v fallocate0${i} > /dev/null 2>&1; then
> @@ -56,13 +57,15 @@ ext4_test_persist_prealloc()
>  			return
>  		fi
>  
> -		fallocate0${i} | grep -q "CONF"
> +		TMPDIR=mnt_point; fallocate0${i} | grep -q "CONF"
>  		if [ $? -ne $ret ]; then
>  			tst_resm TFAIL "fallocate's return value is not expected"
>  			umount mnt_point
> +			TMPDIR=$temp_tmpdir
>  			return
>  		fi
>  	}
> +	TMPDIR=$temp_tmpdir

I've moved the TMPDIR restoration closer to the fallocate call so it's
now:

+               temp_tmpdir=$TMPDIR
+               TMPDIR=mnt_point; fallocate0${i} | grep -q "CONF"
+               TMPDIR=$temp_tmpdir


And pushed, thanks.

PS: Sorry for the delay.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] fs/ext4-new-features: Fix

[chrubis]

Hi!
> * As Xiaoguang Wnag <wangxg.fnst@cn.fujitsu.com> said:
> "Now I think 'grep -q CONF' is not enough, if fallocate[1-3] prints TBROK..."
> Change these like:
> -		TMPDIR=mnt_point; fallocate0${i} | grep -q "CONF"
> +		TMPDIR=mnt_point; fallocate0${i} > /dev/null 2>&1
> +		ret=$?
> 		TMPDIR=$temp_tmpdir
> 
> -		if [ $? -ne $ret ]; then
> +		if [ $ret -ne 0 ]; then

Pushed, thanks (for noticing the silly mistake I did).

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list