Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+5 -1
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 079
# FS QA Test No. 079
#
# Run the t_immutable test program for immutable/append-only files.
#
@@ -49,6 +49,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
echo "*** cleaning up"
$timmutable -r $SCRATCH_MNT/$seq
umount $SCRATCH_MNT
@@ -58,6 +59,9 @@ _cleanup()
. ./common.rc
. ./common.filter
_supported_fs xfs
_supported_os Linux
_require_scratch
[ -x $timmutable ] || _notrun "t_immutable was not built for this platform"