From: Josef Bacik <jbacik@fb.com>
Date: Tue, 5 Apr 2016 01:46:12 +0000 (+1000)
Subject: common: replace chattr with $CHATTR_PROG
X-Git-Tag: v2022.05.01~2549
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=102ffa0c96528ab07801b47c8d099fcf12a49b13

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 03d105aa..42a55b7e 100755
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -54,7 +54,7 @@ __workout()
 	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
 }
 
diff --git a/tests/btrfs/059 b/tests/btrfs/059
index 6e57cce3..8f106d22 100755
--- 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..."
-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
@@ -71,7 +71,7 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/file1 compression | \
 	_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
diff --git a/tests/ext4/006 b/tests/ext4/006
index b33a2b13..f6cca662 100755
--- 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
-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
diff --git a/tests/ext4/007 b/tests/ext4/007
index 5c2b9e2a..6719c8b9 100755
--- a/tests/ext4/007
+++ b/tests/ext4/007
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/ext4/013 b/tests/ext4/013
index 0c98142e..de0929bd 100755
--- a/tests/ext4/013
+++ b/tests/ext4/013
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/ext4/014 b/tests/ext4/014
index 6c3fe6fe..831bed49 100755
--- a/tests/ext4/014
+++ b/tests/ext4/014
@@ -103,7 +103,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/ext4/271 b/tests/ext4/271
index 844364ff..d68c2719 100755
--- 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
-chattr +S $SCRATCH_MNT/file
+$CHATTR_PROG +S $SCRATCH_MNT/file
 # Create sparse file 
 for ((i = 0; i < 21; i++))
 do
diff --git a/tests/generic/277 b/tests/generic/277
index 8e2a32fb..4dfc431b 100755
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -54,8 +54,8 @@ _scratch_cycle_mount
 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
diff --git a/tests/shared/272 b/tests/shared/272
index 8ec2c36c..e5adf385 100755
--- 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
-			chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \
+			$CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \
 				|| 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 $chattr_opt $SCRATCH_MNT/file.$idx \
+			$CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx \
 				>> $seqres.full || exit
 		done
 		sync
diff --git a/tests/xfs/083 b/tests/xfs/083
index 8e14e884..d897754f 100755
--- 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
-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
diff --git a/tests/xfs/085 b/tests/xfs/085
index 73527796..1ca5354f 100755
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/086 b/tests/xfs/086
index 6c803688..143915ba 100755
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -107,7 +107,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"
 
 echo "+ check files"
 broken=0
@@ -130,7 +130,7 @@ echo "+ mount image"
 _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
diff --git a/tests/xfs/087 b/tests/xfs/087
index 03d76358..97c6680f 100755
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -107,7 +107,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/088 b/tests/xfs/088
index e171ba91..18bf6ada 100755
--- a/tests/xfs/088
+++ b/tests/xfs/088
@@ -106,7 +106,7 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ chattr -R -i"
-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"
 
 echo "+ check files"
 broken=0
@@ -129,7 +129,7 @@ echo "+ mount image"
 _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
diff --git a/tests/xfs/089 b/tests/xfs/089
index 4d414201..b6e512f4 100755
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -106,7 +106,7 @@ echo "+ mount image"
 _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
@@ -130,7 +130,7 @@ echo "+ mount image"
 _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
diff --git a/tests/xfs/091 b/tests/xfs/091
index edc54bde..f995d9c6 100755
--- a/tests/xfs/091
+++ b/tests/xfs/091
@@ -106,7 +106,7 @@ echo "+ mount image"
 _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
@@ -130,7 +130,7 @@ echo "+ mount image"
 _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
diff --git a/tests/xfs/093 b/tests/xfs/093
index 9daf20f3..7d4d9b84 100755
--- a/tests/xfs/093
+++ b/tests/xfs/093
@@ -107,7 +107,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/097 b/tests/xfs/097
index 88c8d5fb..f5a81787 100755
--- a/tests/xfs/097
+++ b/tests/xfs/097
@@ -110,7 +110,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/098 b/tests/xfs/098
index fcfba115..d91d617b 100755
--- a/tests/xfs/098
+++ b/tests/xfs/098
@@ -99,7 +99,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/099 b/tests/xfs/099
index 6118abf3..36cf893d 100755
--- a/tests/xfs/099
+++ b/tests/xfs/099
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/100 b/tests/xfs/100
index d5e3d3be..397c6137 100755
--- a/tests/xfs/100
+++ b/tests/xfs/100
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/101 b/tests/xfs/101
index 99f4b8fc..09af6499 100755
--- a/tests/xfs/101
+++ b/tests/xfs/101
@@ -96,7 +96,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/102 b/tests/xfs/102
index 641a96c6..5d1965e3 100755
--- a/tests/xfs/102
+++ b/tests/xfs/102
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/105 b/tests/xfs/105
index 2594ca36..516639ad 100755
--- a/tests/xfs/105
+++ b/tests/xfs/105
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/112 b/tests/xfs/112
index 27ca6d8d..aa7561e1 100755
--- a/tests/xfs/112
+++ b/tests/xfs/112
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/113 b/tests/xfs/113
index 21277345..8aa33952 100755
--- a/tests/xfs/113
+++ b/tests/xfs/113
@@ -101,7 +101,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/117 b/tests/xfs/117
index 5d827f04..27dafd97 100755
--- a/tests/xfs/117
+++ b/tests/xfs/117
@@ -109,7 +109,7 @@ echo "+ mount image (2)"
 _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
diff --git a/tests/xfs/120 b/tests/xfs/120
index ca7b7809..08a46151 100755
--- a/tests/xfs/120
+++ b/tests/xfs/120
@@ -94,7 +94,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/124 b/tests/xfs/124
index 07be1f3d..239c2462 100755
--- a/tests/xfs/124
+++ b/tests/xfs/124
@@ -100,7 +100,7 @@ echo "+ mount image (2)"
 _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")
diff --git a/tests/xfs/125 b/tests/xfs/125
index 8acd2314..cf61e022 100755
--- a/tests/xfs/125
+++ b/tests/xfs/125
@@ -100,7 +100,7 @@ echo "+ mount image (2)"
 _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"
diff --git a/tests/xfs/126 b/tests/xfs/126
index dd4d5bfb..ebe84fc8 100755
--- a/tests/xfs/126
+++ b/tests/xfs/126
@@ -105,7 +105,7 @@ echo "+ mount image (2)"
 _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")
diff --git a/tests/xfs/130 b/tests/xfs/130
index b64ea8c0..7d8ea2a4 100755
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -94,7 +94,7 @@ echo "+ mount image (2)"
 _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" || \
diff --git a/tests/xfs/195 b/tests/xfs/195
index 21fcb003..3948ca40 100755
--- 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)"
-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)"
diff --git a/tests/xfs/235 b/tests/xfs/235
index 370131bf..c388af18 100755
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -92,7 +92,7 @@ echo "+ mount image (2)"
 _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 || \