xfstests: do not call attr/getfattr/setfattr direcly

Index: xfstests-dev/021
===================================================================
@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1
 
 _attr()
 {
-	attr $* 2>$tmp.err >$tmp.out
+	${ATTR_PROG} $* 2>$tmp.err >$tmp.out
 	exit=$?
 	sed \
 	    -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g" \

@@ -60,7 +60,7 @@ _attr()
 
 _getfattr()
 {
-	getfattr $* 2>$tmp.err >$tmp.out
+	${GETFATTR_PROG} $* 2>$tmp.err >$tmp.out
 	exit=$?
 	sed \
 	    -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g" \

Index: xfstests-dev/093
===================================================================
@@ -138,16 +138,16 @@ echo "restore perms on file"
 chmod 777 $file
 
 echo "set a root EA on file"
-attr -R -s test -V testval $file | _filefilter
+${ATTR_PROG} -R -s test -V testval $file | _filefilter
 
 echo "list EA on file"
-attr -R -l $file | _filefilter
+${ATTR_PROG} -R -l $file | _filefilter
 
 echo "as non-root try to append to file"
 $runas -u $uid $tmp.append 2>&1 | _filefilter
 
 echo "list EA on file"
-attr -R -l $file | _filefilter
+${ATTR_PROG} -R -l $file | _filefilter
 
 chown $uid $file
 chmod ugo+w $testdir

214 lines not on this page · raw message

214 lines not on this page · raw message

Index: xfstests-dev/115
===================================================================
@@ -152,67 +152,67 @@ _do_test()
 	echo ""
 	echo "1. remove the EA"
 	echo ""
-	attr -Fl dir2/file2
+	${ATTR_PROG} -Fl dir2/file2
 	stat_ino=`stat -iq dir2`
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
 	#echo "attrname = $attrname"
-	attr -Fr "$attrname" dir2/file2
-	attr -Fl dir2/file2
+	${ATTR_PROG} -Fr "$attrname" dir2/file2
+	${ATTR_PROG} -Fl dir2/file2
 
 	echo ""
 	echo "2. change the EA name"
 	echo ""
-	attr -Fl dir2/dir3/file3
+	${ATTR_PROG} -Fl dir2/dir3/file3
 	stat_ino=100
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
 	attrvalue=file3
-	attr -Fs "$attrname" -V $attrvalue dir2/dir3/file3
-	attr -Fl dir2/dir3/file3
+	${ATTR_PROG} -Fs "$attrname" -V $attrvalue dir2/dir3/file3
+	${ATTR_PROG} -Fl dir2/dir3/file3
 
 	echo ""
 	echo "3. change the EA value"
 	echo ""
-	attr -Fl $d/file4
+	${ATTR_PROG} -Fl $d/file4
 	stat_ino=`stat -iq $d`
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
 	attrvalue=woopdydoo
-	attr -Fs "$attrname" -V "$attrvalue" $d/file4
-	attr -Fl $d/file4
-	attr -Fg "$attrname" $d/file4
+	${ATTR_PROG} -Fs "$attrname" -V "$attrvalue" $d/file4
+	${ATTR_PROG} -Fl $d/file4
+	${ATTR_PROG} -Fg "$attrname" $d/file4
 
 	echo ""
 	echo "4. add an extra EA - diff name, same value"
 	echo ""
-	attr -Fl $d/file5
+	${ATTR_PROG} -Fl $d/file5
 	stat_ino=100
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
 	attrvalue=file5
-	attr -Fs "$attrname" -V $attrvalue $d/file5
-	attr -Fl $d/file5
-	attr -Fg "$attrname" $d/file5
+	${ATTR_PROG} -Fs "$attrname" -V $attrvalue $d/file5
+	${ATTR_PROG} -Fl $d/file5
+	${ATTR_PROG} -Fg "$attrname" $d/file5
 
 	echo ""
 	echo "5. add an extra EA - diff name, diff value"
 	echo ""
-	attr -Fl $d/file6
+	${ATTR_PROG} -Fl $d/file6
 	stat_ino=100
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
 	attrvalue=file600
-	attr -Fs "$attrname" -V $attrvalue $d/file6
-	attr -Fl $d/file6
-	attr -Fg "$attrname" $d/file6
+	${ATTR_PROG} -Fs "$attrname" -V $attrvalue $d/file6
+	${ATTR_PROG} -Fl $d/file6
+	${ATTR_PROG} -Fg "$attrname" $d/file6
 
 	echo ""
 	echo "6. give bad fmt'ed EA name and get rid of existing name"
 	echo ""
 	attrname=woof
 	attrvalue=file7
-	attr -Fs "$attrname" -V $attrvalue $d/file7
+	${ATTR_PROG} -Fs "$attrname" -V $attrvalue $d/file7
 	# remove old attrname
 	cnt=1
 	stat_ino=`stat -iq $d`
 	attrname=`printf "%.16x %.16x" $stat_ino $cnt`
-	attr -Fr "$attrname" $d/file7
+	${ATTR_PROG} -Fr "$attrname" $d/file7
 
 	echo ""
 	echo "--- now check it ---"

Index: xfstests-dev/136
===================================================================
@@ -77,7 +77,7 @@ add_eas()
     echo ""; echo "** add $start..$end EAs **"
     i=$start
     while [ $i -le $end ]; do 
-	attr -s name.$i -V value $file >/dev/null
+	${ATTR_PROG} -s name.$i -V value $file >/dev/null
 	let i=$i+1
     done
 }

@@ -89,7 +89,7 @@ rm_eas()
     echo ""; echo "** rm $start..$end EAs **"
     i=$start
     while [ $i -le $end ]; do 
-	attr -r name.$i $file >/dev/null
+	${ATTR_PROG} -r name.$i $file >/dev/null
 	let i=$i+1
     done
 }

@@ -343,7 +343,7 @@ _test_initial_sf_ea()
 	touch $file
 	vlen=402
 	vlen=300
-	dd if=/dev/zero bs=1 count=$vlen | attr -s name $file
+	dd if=/dev/zero bs=1 count=$vlen | ${ATTR_PROG} -s name $file
 	_print_inode
 }