Fixed merge problems

075

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 075
+# FS QA Test No. 075
 #
 # fsx
 #
@@ -48,7 +48,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
-    rm -rf $TEST_DIR/fsx.* $tmp.*
+    cd /
+    rm -rf $testdir/fsx.* $tmp.*
+    _cleanup_testdir
 }
 
 # get standard environment, filters and checks
@@ -60,7 +62,7 @@ _do_test()
     _n="$1"
     _param="$2"
 
-    out=$TEST_DIR/fsx
+    out=$testdir/fsx
     rm -rf $out
     if ! mkdir $out
     then
@@ -74,6 +76,15 @@ _do_test()
     echo "fsx.$_n : $_param"
     echo "-----------------------------------------------"
 
+    if [ "$FSTYP" = "nfs" ]
+    then
+	if [ "$_n" = "1" -o "$_n" = "3" ]
+	then
+	    # HACK: nfs don't handle preallocation (-x) so just skip this test
+	    return
+	fi
+    fi
+
     # This cd and use of -P gets full debug on $here (not TEST_DEV)
     cd $out
     if ! $here/ltp/fsx $_param -P $here $seq.$_n >/dev/null
@@ -90,6 +101,10 @@ _do_test()
 
 
 # real QA test starts here
+_supported_fs xfs udf nfs
+_supported_os IRIX Linux
+
+_setup_testdir
 
 rm -f $here/$seq.full
 echo "brevity is wit..."