Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+4 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 069
# FS QA Test No. 069
#
# Test out writes with O_APPEND flag sets.
#
@@ -51,6 +51,8 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
. ./common.filter
# real QA test starts here
_supported_fs xfs udf nfs
_supported_os IRIX Linux
_require_scratch
rm -f $seq.full
@@ -58,7 +60,7 @@ rm -f $seq.full
umount $SCRATCH_DEV >/dev/null 2>&1
echo "*** mkfs"
_scratch_mkfs_xfs >/dev/null || _fail "mkfs failed"
_scratch_mkfs >/dev/null || _fail "mkfs failed"
echo "*** mount FS"
_scratch_mount >/dev/null || _fail "mount failed"