More merge conflicts

This commit is contained in:
ptools
2004-06-15 07:36:09 +00:00
parent cb6beb9759
commit 048a7a8add
12 changed files with 307 additions and 139 deletions
+7 -1
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 021
# FS QA Test No. 021
#
# xfs_db type attr test (pv 797508 linux-xfs & IRIX)
#
@@ -87,6 +87,12 @@ _getfattr()
}
# real QA test starts here
_supported_fs xfs
_supported_os Linux
[ -x /usr/bin/attr ] || _notrun "attr is not installed"
[ -x /usr/bin/getfattr ] || _notrun "getfattr is not installed"
_require_scratch
rm -f $seq.full