Xfstest 245: accept ENOTEMPTY as a valid error for the test
PATCH 1/1 Xfstest 245: accept ENOTEMPTY as a valid error for the test
Testt 245 only checks to see if the rename returned EEXIST, but according to the rename(2) manpage, ENOTEMPTY is also a valid result, which is in fact what Btrfs returns. So just filter the output for ENOTEMPTY so that either EEXIST or ENOTEMPTY will pass the test. It's not pretty I know, but I couldn't really figure out a good way to get an either/or output to compare. With this fix Btrfs now passes 245. Thanks,
Signed-off-by Josef Bacik <[email protected]>
--- 245 | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) mode change 100644 => 100755 245
245 +9 -1
@@ -48,6 +48,14 @@ _cleanup() rm -rf $dir } +# According to the rename(2) manpage you can get either EEXIST or ENOTEMPTY as an +# error for trying to rename a non-empty directory, so just catch the error for +# ENOTMEMPTY and replace it with the EEXIST output so that either result passes +_filter_directory_not_empty() +{ + sed -e "s,Directory not empty,File exists,g" +} + trap "_cleanup ; exit \$status" 0 1 2 3 15
@@ -59,7 +67,7 @@ touch $dir/aa/1 mkdir $dir/ab/aa touch $dir/ab/aa/2 -mv $dir/ab/aa/ $dir 2>&1 | _filter_test_dir +mv $dir/ab/aa/ $dir 2>&1 | _filter_test_dir | _filter_directory_not_empty status=0 exit $status
Signature · 6 lines
1.6.6.1 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Christoph Hellwig
AppliedThanks, applied.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs