Fixed merge problems

048

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 048
+# FS QA Test No. 048
 #
 # test return codes from xfsctl on bad userspace address
 #
@@ -44,15 +44,26 @@ echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
 
-# real QA test starts here
+_cleanup()
+{
+    cd /
+    rm -f $tmp.*
+    _cleanup_testdir
+}
 
-src/fault $TEST_DIR || exit
+# real QA test starts here
+_supported_fs xfs
+_supported_os IRIX Linux
+
+_setup_testdir
+
+src/fault $testdir || exit
 
 # success, all done
 status=0