aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2018-01-26 09:59:08 +0200
committerEryu Guan <eguan@redhat.com>2018-01-29 15:55:47 +0800
commit2d9c37702515249ac916acc0ef56fe69c189491d (patch)
tree6948c34e677338ec8382904017918ecad6047828
parent8a2d6ed9fcd9ba255df9d7c5a5486dfc92b722ef (diff)
downloadxfstests-2d9c37702515249ac916acc0ef56fe69c189491d.tar.gz
overlay/017: 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 <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
-rwxr-xr-xtests/overlay/0178
-rw-r--r--tests/overlay/group2
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/overlay/017 b/tests/overlay/017
index 03955d0d7b..2102b9e5b5 100755
--- a/tests/overlay/017
+++ b/tests/overlay/017
@@ -57,6 +57,8 @@ _supported_os Linux
_require_scratch
_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
@@ -111,8 +113,8 @@ function check_inode_numbers()
done
}
-_scratch_mount
-
+# Enable redirect_dir for renaming a merge directory
+_scratch_mount "-o redirect_dir=on"
rm -f $tmp.*
testdir=$SCRATCH_MNT/test
@@ -140,7 +142,7 @@ echo 3 > /proc/sys/vm/drop_caches
check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move
# Verify that the inode numbers survive a mount cycle
-_scratch_cycle_mount
+_scratch_cycle_mount "redirect_dir=on"
# Compare inode numbers before/after mount cycle
check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle
diff --git a/tests/overlay/group b/tests/overlay/group
index 7e541e4538..edea64aa32 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -19,7 +19,7 @@
014 auto quick copyup
015 auto quick whiteout
016 auto quick copyup
-017 auto quick copyup
+017 auto quick copyup redirect
018 auto quick copyup hardlink
019 auto stress
020 auto quick copyup perms