aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2018-04-25 23:53:26 -0600
committerEryu Guan <guaneryu@gmail.com>2018-04-27 10:46:20 +0800
commite97ef0145ce0322854ce932bc00cfb1376cdb3e2 (patch)
tree9933ab31d84a301754081dea3403e7b67b44b3e0
parente9f768ef0ebb71d39ced4c6ff7ff796018958648 (diff)
downloadxfstests-dev-e97ef0145ce0322854ce932bc00cfb1376cdb3e2.tar.gz
overlay/043: require and enable redirect_dir
This test renames a merge directory so it needs to enable redirect_dir feature, which is not enabled by default. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rwxr-xr-xtests/overlay/0439
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/overlay/043 b/tests/overlay/043
index 46df6866ac..f70ee7f6f3 100755
--- a/tests/overlay/043
+++ b/tests/overlay/043
@@ -62,6 +62,8 @@ _require_scratch_nocheck
_require_test
_require_test_program "af_unix"
_require_test_program "t_dir_type"
+# Require redirect_dir for renaming a merge directory
+_require_scratch_feature redirect_dir
rm -f $seqres.full
@@ -83,7 +85,8 @@ _scratch_mkfs >>$seqres.full 2>&1
upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
-_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
+# Enable redirect_dir for renaming a merge directory
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
FILES="dir file symlink chrdev blkdev fifo socket"
@@ -150,13 +153,13 @@ check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move
# Verify that the inode numbers survive a mount cycle
$UMOUNT_PROG $SCRATCH_MNT
-_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
# Compare inode numbers before/after mount cycle
check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle
# check overlayfs
-_overlay_check_scratch_dirs $lowerdir $upperdir $workdir
+_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
echo "Silence is golden"
status=0