Fixed merge problems

008

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 008
+# FS QA Test No. 008
 #
 # randholes test
 #
@@ -45,11 +45,13 @@ here=`pwd`
 tmp=/tmp/$$
 status=0	# success is the default!
 pgsize=`$here/src/feature -p`
-trap "rm -f $tmp.*; _cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
-    rm -rf $TEST_DIR/randholes.$$.*
+    rm -f $tmp.*
+    rm -rf $testdir/randholes.$$.*
+    _cleanup_testdir
 }
 
 _filter()
@@ -67,7 +69,7 @@ _do_test()
     _holes="$2"
     _param="$3"
     
-    out=$TEST_DIR/randholes.$$.$_n
+    out=$testdir/randholes.$$.$_n
     echo ""
     echo "randholes.$_n : $_param" | _filter
     echo "------------------------------------------"
@@ -92,6 +94,10 @@ _do_test()
 }
 
 # real QA test starts here
+_supported_fs xfs
+_supported_os IRIX Linux
+
+_setup_testdir
 
 rm -f $here/$seq.out.full