Fixed merge problems

006

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 006
+# FS QA Test No. 006
 #
 # permname
 #
@@ -48,7 +48,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
-    rm -rf $TEST_DIR/permname.$$
+    cd /
+    rm -f $tmp.*
+    rm -rf $testdir/permname.$$
+    _cleanup_testdir
 }
 
 _count()
@@ -65,23 +68,26 @@ _count()
 . ./common.filter
 
 # real QA test starts here
+_supported_fs xfs udf nfs
+_supported_os IRIX Linux
 
+_setup_testdir
 
-mkdir $TEST_DIR/permname.$$
+mkdir $testdir/permname.$$
 
 echo ""
 echo "single thread permname"
 echo "----------------------"
-mkdir $TEST_DIR/permname.$$/a
-cd $TEST_DIR/permname.$$/a
+mkdir $testdir/permname.$$/a
+cd $testdir/permname.$$/a
 $here/src/permname -c 4 -l 6 -p 1 || echo "permname returned $?"
 find . | _count
 
 echo ""
 echo "multi thread permname"
 echo "----------------------"
-mkdir $TEST_DIR/permname.$$/b
-cd $TEST_DIR/permname.$$/b
+mkdir $testdir/permname.$$/b
+cd $testdir/permname.$$/b
 $here/src/permname -c 4 -l 6 -p 4 || echo "permname returned $?"
 find . | _count