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>

diff --git a/tests/overlay/017 b/tests/overlay/017
index 03955d0d7b2fde8c27122168b690f2d056a5d551..2102b9e5b58abdea110921acb7c4651cb3f3c63d 100755 (executable)
--- 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_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
 
 
 rm -f $seqres.full
 


@@ -111,8 +113,8 @@ function check_inode_numbers()
        done
 }
 
        done
 }
 

-_scratch_mount
-
+# Enable redirect_dir for renaming a merge directory
+_scratch_mount "-o redirect_dir=on"

 
 rm -f $tmp.*
 testdir=$SCRATCH_MNT/test
 
 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
 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
 
 # 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 7e541e453884a0f809711f0c27ddb7f3db266c92..edea64aa3230cd550524397373a83d72f494669b 100644 (file)
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -19,7 +19,7 @@
 014 auto quick copyup
 015 auto quick whiteout
 016 auto quick copyup
 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
 018 auto quick copyup hardlink
 019 auto stress
 020 auto quick copyup perms