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
+3 -1
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 076
# FS QA Test No. 076
#
# Test blockdev reads in parallel with filesystem reads/writes
#
@@ -67,6 +67,8 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.filter
# real QA test starts here
_supported_fs xfs udf
_supported_os IRIX Linux
_require_scratch