[xfstests,v2] common/rc: Add path $here before src/t_dir_type
diff mbox series

Message ID 1571188500-82985-1-git-send-email-chengzhihao1@huawei.com
State New
Headers show
Series
  • [xfstests,v2] common/rc: Add path $here before src/t_dir_type
Related show

Commit Message

Zhihao Cheng Oct. 16, 2019, 1:15 a.m. UTC
Running generic/192 with overlayfs(Let ubifs as base fs) yields the
following output:

  generic/192 - output mismatch
     QA output created by 192
     sleep for 5 seconds
     test
    +./common/rc: line 316: src/t_dir_type: No such file or directory
     delta1 is in range
     delta2 is in range
    ...

When the use case fails, the call stack in generic/192 is:

  local unknowns=$(src/t_dir_type $dir u | wc -l)	common/rc:316
  _supports_filetype					common/rc:299
  _overlay_mount					common/overlay:52
  _overlay_test_mount					common/overlay:93
  _test_mount						common/rc:407
  _test_cycle_mount					generic/192:50

Before _test_cycle_mount() being invoked, generic/192 executed 'cd /'
to change work dir from 'xfstests-dev' to '/', so src/t_dir_type was not
found.

Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eryu Guan Oct. 17, 2019, 9:19 a.m. UTC | #1
On Wed, Oct 16, 2019 at 09:15:00AM +0800, Zhihao Cheng wrote:
> Running generic/192 with overlayfs(Let ubifs as base fs) yields the
> following output:
> 
>   generic/192 - output mismatch
>      QA output created by 192
>      sleep for 5 seconds
>      test
>     +./common/rc: line 316: src/t_dir_type: No such file or directory
>      delta1 is in range
>      delta2 is in range
>     ...
> 
> When the use case fails, the call stack in generic/192 is:
> 
>   local unknowns=$(src/t_dir_type $dir u | wc -l)	common/rc:316
>   _supports_filetype					common/rc:299
>   _overlay_mount					common/overlay:52
>   _overlay_test_mount					common/overlay:93
>   _test_mount						common/rc:407
>   _test_cycle_mount					generic/192:50
> 
> Before _test_cycle_mount() being invoked, generic/192 executed 'cd /'
> to change work dir from 'xfstests-dev' to '/', so src/t_dir_type was not
> found.
> 
> Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>

Thanks for the patch! But I think it's better to fix all similar issues
in the whole fstests tree, I can see there're a lot more tests use
src/<file> without the $here prefix.

Thanks!

Eryu

> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index cfaabf10..28c27975 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -313,7 +313,7 @@ _supports_filetype()
>  		local testfile=$dir/$$.ftype
>  		touch $testfile
>  		# look for DT_UNKNOWN files
> -		local unknowns=$(src/t_dir_type $dir u | wc -l)
> +		local unknowns=$($here/src/t_dir_type $dir u | wc -l)
>  		rm $testfile
>  		# 0 unknowns is success
>  		return $unknowns
> -- 
> 2.13.6
>

Patch
diff mbox series

diff --git a/common/rc b/common/rc
index cfaabf10..28c27975 100644
--- a/common/rc
+++ b/common/rc
@@ -313,7 +313,7 @@  _supports_filetype()
 		local testfile=$dir/$$.ftype
 		touch $testfile
 		# look for DT_UNKNOWN files
-		local unknowns=$(src/t_dir_type $dir u | wc -l)
+		local unknowns=$($here/src/t_dir_type $dir u | wc -l)
 		rm $testfile
 		# 0 unknowns is success
 		return $unknowns