Fixed merge problems

031

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 031
+# FS QA Test No. 031
 #
 # exercise xfs_repair - ensure repeated use doesn't corrupt
 #
@@ -51,6 +51,9 @@ rm -f $seq.full
 . ./common.rc
 . ./common.filter
 
+# link correct .out file
+_link_out_file $seq.out
+
 _check_repair()
 {
 	_scratch_xfs_repair >$tmp.0 2>&1
@@ -103,7 +106,9 @@ EOF
 }
 
 # real QA test starts here
-# 
+_supported_fs xfs
+_supported_os IRIX Linux
+
 _require_nobigloopfs
 _require_scratch
 
@@ -116,7 +121,7 @@ _create_proto 0
 echo "=== version 1, one entry"
 _scratch_mkfs_xfs $MKFSV1 >$tmp.mkfs0 2>&1
 _filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs
-source $tmp.mkfs
+. $tmp.mkfs
 _check_repair
 echo "=== version 2, one entry (shortform)"
 _scratch_mkfs_xfs $MKFSV2 | _filter_mkfs >/dev/null 2>&1