common: replace chattr with $CHATTR_PROG

We have a wrapper around chattr to make sure people don't do the wrong thing on
their boxes, so we need to be able to specify CHATTR_PROG and have it actually
work, so replace all chattr calls with $CHATTR_PROG.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/btrfs/024 b/tests/btrfs/024
index 03d105aa27460471744cb7b92148780796ceea42..42a55b7e3ba82f8162de7cb2166afc4504aba094 100755 (executable)
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -54,7 +54,7 @@ __workout()
        work_file="$SCRATCH_MNT/tmpfile"
 
        touch $work_file
        work_file="$SCRATCH_MNT/tmpfile"
 
        touch $work_file

-       chattr =c $work_file
+       $CHATTR_PROG =c $work_file

        $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
 }
 
        $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
 }
 

diff --git a/tests/btrfs/059 b/tests/btrfs/059
index 6e57cce35efb93267aaf92eb4e355da873791d2a..8f106d22fc2c40bfc56b4a7130f98669760215d6 100755 (executable)
--- a/tests/btrfs/059
+++ b/tests/btrfs/059
@@ -60,7 +60,7 @@ _scratch_mount
 
 mkdir $SCRATCH_MNT/testdir
 echo "Setting compression flag in the directory..."
 
 mkdir $SCRATCH_MNT/testdir
 echo "Setting compression flag in the directory..."

-chattr +c $SCRATCH_MNT/testdir
+$CHATTR_PROG +c $SCRATCH_MNT/testdir

 echo "Directory compression property value:"
 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression | \
        _filter_btrfs_compress_property
 echo "Directory compression property value:"
 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression | \
        _filter_btrfs_compress_property


@@ -71,7 +71,7 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/file1 compression | \
        _filter_btrfs_compress_property
 
 echo "Clearing compression flag from directory..."
        _filter_btrfs_compress_property
 
 echo "Clearing compression flag from directory..."

-chattr -c $SCRATCH_MNT/testdir
+$CHATTR_PROG -c $SCRATCH_MNT/testdir

 echo "Directory compression property value:"
 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression | \
        _filter_btrfs_compress_property
 echo "Directory compression property value:"
 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression | \
        _filter_btrfs_compress_property

diff --git a/tests/ext4/006 b/tests/ext4/006
index b33a2b1321144034bea6351f8437d261f6273f9a..f6cca66274243f6627587c9c405942bc41c9f7a3 100755 (executable)
--- a/tests/ext4/006
+++ b/tests/ext4/006
@@ -135,7 +135,7 @@ echo "++ mount image (2)" >> $ROUND2_LOG
 _scratch_mount >> $ROUND2_LOG 2>&1
 
 echo "++ chattr -R -i" >> $ROUND2_LOG
 _scratch_mount >> $ROUND2_LOG 2>&1
 
 echo "++ chattr -R -i" >> $ROUND2_LOG

-chattr -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG

 
 echo "++ test scratch" >> $ROUND2_LOG
 _scratch_fuzz_test >> $ROUND2_LOG 2>&1
 
 echo "++ test scratch" >> $ROUND2_LOG
 _scratch_fuzz_test >> $ROUND2_LOG 2>&1

diff --git a/tests/ext4/007 b/tests/ext4/007
index 5c2b9e2af9a81a691dc3419aa79a8b35e33f6bef..6719c8b9450f7de51b7c0604b5fbe4bbdaed855d 100755 (executable)
--- a/tests/ext4/007
+++ b/tests/ext4/007
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/ext4/013 b/tests/ext4/013
index 0c98142ecdb0fcd83c175dc24306bf20a71437c5..de0929bd0ec742f81227eef9f34170edb178adce 100755 (executable)
--- a/tests/ext4/013
+++ b/tests/ext4/013
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/ext4/014 b/tests/ext4/014
index 6c3fe6fec8dbc4bfa28bf4979a614d7cc137d7a1..831bed49def668aca6d628d66526fae2badb87f1 100755 (executable)
--- a/tests/ext4/014
+++ b/tests/ext4/014
@@ -103,7 +103,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/ext4/271 b/tests/ext4/271
index 844364fff401bbf4ee0c8198cc01990e3804c1dc..d68c2719024ee33c1015c4f88823920d34778d67 100755 (executable)
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -47,7 +47,7 @@ _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1
 # metadata sync writes inside ext4_handle_dirty_metadata()
 _scratch_mount -onoload
 touch $SCRATCH_MNT/file
 # metadata sync writes inside ext4_handle_dirty_metadata()
 _scratch_mount -onoload
 touch $SCRATCH_MNT/file

-chattr +S $SCRATCH_MNT/file
+$CHATTR_PROG +S $SCRATCH_MNT/file

 # Create sparse file 
 for ((i = 0; i < 21; i++))
 do
 # Create sparse file 
 for ((i = 0; i < 21; i++))
 do

diff --git a/tests/generic/277 b/tests/generic/277
index 8e2a32fb0c20fb08d422c8bec792f7ca0810fa8d..4dfc431b8d8a1b7c53204b6a61bde857b6f8fd50 100755 (executable)
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -54,8 +54,8 @@ _scratch_cycle_mount
 ctime1=`stat -c %z $SCRATCH_MNT/tmp`
 
 sleep 1
 ctime1=`stat -c %z $SCRATCH_MNT/tmp`
 
 sleep 1

-chattr +A $SCRATCH_MNT/tmp
-chattr -A $SCRATCH_MNT/tmp
+$CHATTR_PROG +A $SCRATCH_MNT/tmp
+$CHATTR_PROG -A $SCRATCH_MNT/tmp

 ctime2=`stat -c %z $SCRATCH_MNT/tmp`
 
 _scratch_cycle_mount
 ctime2=`stat -c %z $SCRATCH_MNT/tmp`
 
 _scratch_cycle_mount

diff --git a/tests/shared/272 b/tests/shared/272
index 8ec2c36c150c5b3f31a5416c6940bbf98965d5ed..e5adf385bb52a9067eaf123dbc13754b14f5ec01 100755 (executable)
--- a/tests/shared/272
+++ b/tests/shared/272
@@ -56,7 +56,7 @@ chattr_opt: $chattr_opt" >>$seqres.full
                        dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
                                bs=1M count=4 $write_opt \
                                >> $seqres.full 2>&1 || exit
                        dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
                                bs=1M count=4 $write_opt \
                                >> $seqres.full 2>&1 || exit

-                       chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \
+                       $CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \

                                || exit
                done
        done
                                || exit
                done
        done


@@ -73,7 +73,7 @@ chattr_opt: $chattr_opt" >>$seqres.full
 chattr_opt: $chattr_opt" >>$seqres.full
                        dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
                                bs=1M $write_opt >> $seqres.full 2>&1
 chattr_opt: $chattr_opt" >>$seqres.full
                        dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
                                bs=1M $write_opt >> $seqres.full 2>&1

-                       chattr $chattr_opt $SCRATCH_MNT/file.$idx \
+                       $CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx \

                                >> $seqres.full || exit
                done
                sync
                                >> $seqres.full || exit
                done
                sync

diff --git a/tests/xfs/083 b/tests/xfs/083
index 8e14e88432d1f0d15be9240e1a75e3536ed47430..d897754f40a0a1478a45415ea000c6dc7e1cd903 100755 (executable)
--- a/tests/xfs/083
+++ b/tests/xfs/083
@@ -148,7 +148,7 @@ echo "++ mount image (2)" >> $ROUND2_LOG
 _scratch_mount >> $ROUND2_LOG 2>&1
 
 echo "++ chattr -R -i" >> $ROUND2_LOG
 _scratch_mount >> $ROUND2_LOG 2>&1
 
 echo "++ chattr -R -i" >> $ROUND2_LOG

-chattr -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG

 
 echo "+++ test scratch" >> $ROUND2_LOG
 _scratch_fuzz_test >> $ROUND2_LOG 2>&1
 
 echo "+++ test scratch" >> $ROUND2_LOG
 _scratch_fuzz_test >> $ROUND2_LOG 2>&1

diff --git a/tests/xfs/085 b/tests/xfs/085
index 735277961e2094a30d591161509c1521ef7aad45..1ca5354f31ebcdc5e79169bafaef59968b1ee60d 100755 (executable)
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/086 b/tests/xfs/086
index 6c803688c25f1628c066f950a742deffa6375be3..143915bafaa1195903d5e10f89ea9da967c0da42 100755 (executable)
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -107,7 +107,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files"
 broken=0
 
 echo "+ check files"
 broken=0


@@ -130,7 +130,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files (2)"
 broken=0
 
 echo "+ check files (2)"
 broken=0

diff --git a/tests/xfs/087 b/tests/xfs/087
index 03d76358869033935d30e5e1698c4ce3dd3bad70..97c6680f8492c12f5bc53ee2cdeb1cce456f7575 100755 (executable)
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -107,7 +107,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/088 b/tests/xfs/088
index e171ba91f96a265d4e7280ae2ee0f5a8792a0f06..18bf6ada26f8b7d60039186f394ac59b853ebdcd 100755 (executable)
--- a/tests/xfs/088
+++ b/tests/xfs/088
@@ -106,7 +106,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files"
 broken=0
 
 echo "+ check files"
 broken=0


@@ -129,7 +129,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files (2)"
 broken=0
 
 echo "+ check files (2)"
 broken=0

diff --git a/tests/xfs/089 b/tests/xfs/089
index 4d414201dbe2517b665f9ae54ac0107fadb48ed4..b6e512f4e96e0786311a2266b12069ffbbeafe08 100755 (executable)
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -106,7 +106,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files"
 ls -la "${TESTDIR}" >> $seqres.full
 
 echo "+ check files"
 ls -la "${TESTDIR}" >> $seqres.full


@@ -130,7 +130,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files (2)"
 broken=0
 
 echo "+ check files (2)"
 broken=0

diff --git a/tests/xfs/091 b/tests/xfs/091
index edc54bdeefe389b91cd219df955e47d338ed32a7..f995d9c610902c4a8877fd6bfcada5292c928214 100755 (executable)
--- a/tests/xfs/091
+++ b/tests/xfs/091
@@ -106,7 +106,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files"
 ls -la "${TESTDIR}" >> $seqres.full
 
 echo "+ check files"
 ls -la "${TESTDIR}" >> $seqres.full


@@ -130,7 +130,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ check files (2)"
 broken=0
 
 echo "+ check files (2)"
 broken=0

diff --git a/tests/xfs/093 b/tests/xfs/093
index 9daf20f34897da3919e22af1d4b2701e0d890b4e..7d4d9b849aef35e47a159d238288e56e05b74667 100755 (executable)
--- a/tests/xfs/093
+++ b/tests/xfs/093
@@ -107,7 +107,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/097 b/tests/xfs/097
index 88c8d5fb6b458eb64bf8cf9f195439fc1ed831e0..f5a8178785629f67b8dd289ce17f504cc0e00aa5 100755 (executable)
--- a/tests/xfs/097
+++ b/tests/xfs/097
@@ -110,7 +110,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/098 b/tests/xfs/098
index fcfba1150dc57448937afcbd869c92dfef946ef8..d91d617b80aea94bfac3c532e4a7950c16b89840 100755 (executable)
--- a/tests/xfs/098
+++ b/tests/xfs/098
@@ -99,7 +99,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/099 b/tests/xfs/099
index 6118abf3951e71f80c903886d34c1a4523c36d08..36cf893d0b4054b032cc94570e09496d0a9f7de7 100755 (executable)
--- a/tests/xfs/099
+++ b/tests/xfs/099
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/100 b/tests/xfs/100
index d5e3d3be14a2fe13b571ea599bd7811c7cd593de..397c61372abffab226458fe1895162e4cdbf47e0 100755 (executable)
--- a/tests/xfs/100
+++ b/tests/xfs/100
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/101 b/tests/xfs/101
index 99f4b8fca4d4539475ab704c0f7352a24de5d6e0..09af6499151ec5bf89da7efbe773f7620931e605 100755 (executable)
--- a/tests/xfs/101
+++ b/tests/xfs/101
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/102 b/tests/xfs/102
index 641a96c657c32c1bcc548b61d01c02b38c577090..5d1965e3c6f243b675b960da15aa53cba6ab632f 100755 (executable)
--- a/tests/xfs/102
+++ b/tests/xfs/102
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/105 b/tests/xfs/105
index 2594ca3606af2277d5a4b9569c54f65d13a9847d..516639ad57073a0f9c0356bc3bba601de203207b 100755 (executable)
--- a/tests/xfs/105
+++ b/tests/xfs/105
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/112 b/tests/xfs/112
index 27ca6d8d38cadd5a84127b67df05b6ea84c878b0..aa7561e1d4a53203a9e926a72374f967857c3adc 100755 (executable)
--- a/tests/xfs/112
+++ b/tests/xfs/112
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/113 b/tests/xfs/113
index 212773451e25bc2ac5bc5340f7ac5b16f75eb272..8aa339520b3297e7271b3abb9f0da2b21d805bba 100755 (executable)
--- a/tests/xfs/113
+++ b/tests/xfs/113
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"
 
 echo "+ modify dir (2)"
 mkdir -p "${SCRATCH_MNT}/blockdir"

diff --git a/tests/xfs/117 b/tests/xfs/117
index 5d827f0452445a330bf03dc2354bb6a006949000..27dafd9702fcd67251f3569c6f87ae589f06e890 100755 (executable)
--- a/tests/xfs/117
+++ b/tests/xfs/117
@@ -109,7 +109,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 broken=0
 
 echo "+ modify files (2)"
 broken=0

diff --git a/tests/xfs/120 b/tests/xfs/120
index ca7b7809e5fd5f969577de2163dacbdc891f54b6..08a461517090d0c708ba57177cc75e0e650389b3 100755 (executable)
--- a/tests/xfs/120
+++ b/tests/xfs/120
@@ -94,7 +94,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify files (2)"
 touch "${SCRATCH_MNT}/bigfile"
 
 echo "+ modify files (2)"
 touch "${SCRATCH_MNT}/bigfile"

diff --git a/tests/xfs/124 b/tests/xfs/124
index 07be1f3d15d13d188d1d43548dc8d41f87d8bcd5..239c2462501af9572ef9f522594a077a14033013 100755 (executable)
--- a/tests/xfs/124
+++ b/tests/xfs/124
@@ -100,7 +100,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify xattr (2)"
 getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" > /dev/null 2>&1 && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "remove corrupt xattr")
 
 echo "+ modify xattr (2)"
 getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" > /dev/null 2>&1 && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "remove corrupt xattr")

diff --git a/tests/xfs/125 b/tests/xfs/125
index 8acd231432db914099ffc05d262e06031c403aac..cf61e0227a85a6f981c5c7dfe5fb57fea6368f32 100755 (executable)
--- a/tests/xfs/125
+++ b/tests/xfs/125
@@ -100,7 +100,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify xattr (2)"
 setfattr -n "user.x00000000" -v "1111111111111111" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr"
 
 echo "+ modify xattr (2)"
 setfattr -n "user.x00000000" -v "1111111111111111" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr"

diff --git a/tests/xfs/126 b/tests/xfs/126
index dd4d5bfb4a1a78dfc7c13494f24d77cee6c420c1..ebe84fc83ffbd618bb022679ac32130ba3571cd7 100755 (executable)
--- a/tests/xfs/126
+++ b/tests/xfs/126
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ modify xattr (2)"
 getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" 2> /dev/null && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr")
 
 echo "+ modify xattr (2)"
 getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" 2> /dev/null && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr")

diff --git a/tests/xfs/130 b/tests/xfs/130
index b64ea8c0ef6a3114c303b9d6d6b861c0e4596c0c..7d8ea2a49ebeb42815dcf6fe2ac7e6cfff6aff72 100755 (executable)
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -94,7 +94,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"

 
 echo "+ reflink more (2)"
 _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file5" || \
 
 echo "+ reflink more (2)"
 _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file5" || \

diff --git a/tests/xfs/195 b/tests/xfs/195
index 21fcb00336549d767d84a76620ecf48b926c0148..3948ca40e1b3b798aed83f95f3983c4905e73e9a 100755 (executable)
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -76,7 +76,7 @@ echo "No dump exclude flag set (should not be skipped)"
 _do_dump
 
 echo "Dump exclude flag set, but no sync yet (should be skipped)"
 _do_dump
 
 echo "Dump exclude flag set, but no sync yet (should be skipped)"

-chattr +d $TEST_DIR/d/t
+$CHATTR_PROG +d $TEST_DIR/d/t

 _do_dump
 
 echo "Dump exclude flag set, after sync (should be skipped)"
 _do_dump
 
 echo "Dump exclude flag set, after sync (should be skipped)"

diff --git a/tests/xfs/235 b/tests/xfs/235
index 370131bf6a444106eb328116a209fe03ba907ba0..c388af18fe4d03ad0d8033d3fa3452c9ceaca6d6 100755 (executable)
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -92,7 +92,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
 _scratch_mount
 
 echo "+ chattr -R -i"

-chattr -R -f -i ${SCRATCH_MNT}/
+$CHATTR_PROG -R -f -i ${SCRATCH_MNT}/

 
 echo "+ copy more (2)"
 cp -p ${SCRATCH_MNT}/file1 ${SCRATCH_MNT}/file5 || \
 
 echo "+ copy more (2)"
 cp -p ${SCRATCH_MNT}/file1 ${SCRATCH_MNT}/file5 || \