xfstests: RESULTS_DIR needs to be an absolute path

Some tests 'cd <somedir>' and then direct output to $RESULT_DIR,
which fails if the current working directory is not $here.
Regardless, if an external results directory is to be used it needs
to have a full path specified and the use of $here as the base of
the results files is completely incorrect.

Hence change all the $here/$seqres* references to simply be
$seqres*, and instead encode the full path to the results in
$RESULT_DIR.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Phil White <pwhite@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Dave Chinner
2013-03-15 12:28:06 +00:00
committed by Rich Johnston
parent 0b1e8abd4a
commit e5c7cd83c4
33 changed files with 247 additions and 258 deletions
+15 -15
View File
@@ -82,8 +82,8 @@ _test_create()
p=dir2/dir3/dir4/file4
touch $p
#_print_names $p >>$here/$seqres.full
_print_names $p | tee -a $here/$seqres.full
#_print_names $p >>$seqres.full
_print_names $p | tee -a $seqres.full
_check_paths $SCRATCH_MNT/$p
}
@@ -133,13 +133,13 @@ _test_hardlink()
ln $p $x
done
_print_names $p >>$here/$seqres.full
_print_names $p >>$seqres.full
echo ""
echo "print out names and check after created hardlinks"
echo ""
for x in $paths; do
_print_names $x | tee -a $here/$seqres.full
_print_names $x | tee -a $seqres.full
_check_paths $SCRATCH_MNT/$x
done
@@ -163,7 +163,7 @@ _test_hardlink()
echo ""
for x in $paths; do
if [ -e $x ]; then
_print_names $x | tee -a $here/$seqres.full
_print_names $x | tee -a $seqres.full
_check_paths $SCRATCH_MNT/$x
fi
done
@@ -232,7 +232,7 @@ _test_rename()
_filter_num()
{
tee -a $here/$seqres.full |\
tee -a $seqres.full |\
sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
-e 's/[0-9][0-9]* paths/P paths/g' \
-e 's/seed = [0-9][0-9]*/seed = S/'
@@ -257,7 +257,7 @@ _test_fsstress()
if ! $FSSTRESS_PROG $args | _filter_num
then
echo " fsstress $args returned $?"
cat $tmp.out | tee -a $here/$seqres.full
cat $tmp.out | tee -a $seqres.full
status=1
fi
@@ -286,8 +286,8 @@ _test_dirstress()
if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
then
echo " dirstress failed"
echo "*** dirstress $args" | tee -a $here/$seqres.full
cat $tmp.out >>$here/$seqres.full
echo "*** dirstress $args" | tee -a $seqres.full
cat $tmp.out >>$seqres.full
status=1
exit
fi
@@ -297,8 +297,8 @@ _test_dirstress()
if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
then
echo " dirstress failed"
echo "*** dirstress $args" | tee -a $here/$seqres.full
cat $tmp.out >>$here/$seqres.full
echo "*** dirstress $args" | tee -a $seqres.full
cat $tmp.out >>$seqres.full
status=1
exit
fi
@@ -318,16 +318,16 @@ _require_scratch
_require_attrs
_need_to_be_root
rm -f $here/$seqres.full
rm -f $seqres.full
echo "mkfs"
_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \
_scratch_mkfs_xfs -i parent=1 >>$seqres.full 2>&1 \
|| _notrun "parent inodes not supported"
echo "mount"
_scratch_mount >>$here/$seqres.full 2>&1 \
_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# real QA test starts here