apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: fix _link_out_file callers

Browse Source 
Currently the callers pass $seq, rather than the full path to the
test. As a result, it creates the link in the top level directory
and it points nowhere.  Fix it to create the link in the correct
place.

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:03 +00:00
committed by Rich Johnston
parent 1d5d46db80
commit 401680a11c
18 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.rc
+13 -13
View File
@@ -1760,19 +1760,19 @@ _cleanup_testdir()
_link_out_file()
{
if [ -z "$1" ]; then
echo Error must pass \$seq.
exit
fi
rm -f $1
if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
ln -s $1.irix $1
elif [ "`uname`" == "Linux" ]; then
ln -s $1.linux $1
else
echo Error test $seq does not run on the operating system: `uname`
exit
fi
if [ -z "$1" -o -z "$2" ]; then
echo Error must pass src and dst.
exit
fi
rm -f $2
if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
ln -s $1.irix $2
elif [ "`uname`" == "Linux" ]; then
ln -s $1.linux $2
else
echo Error test $seq does not run on the operating system: `uname`
exit
fi
}
_die()
tests/generic/088
+2 -1
View File
@@ -23,6 +23,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -44,7 +45,7 @@ _filter()
}
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs generic
tests/generic/097
+4 -3
View File
@@ -27,6 +27,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -65,11 +66,11 @@ _umount_and_mount()
# link correct .out file
# This is done bacause udf and xfs print attrs in different orders.
rm -rf $seq.out
rm -rf $seqfull.out
if [ "$FSTYP" == "xfs" ]; then
ln -s $seq.out.xfs $seq.out
ln -s $seq.out.xfs $seqfull.out
else
ln -s $seq.out.udf $seq.out
ln -s $seq.out.udf $seqfull.out
fi
# real QA test starts here
tests/xfs/018
+5 -4
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -55,7 +56,7 @@ _require_scratch
_require_v2log
# link correct .out file
_link_out_file $seq.op
_link_out_file $seq.op $seqfull.op
echo "*** init FS"
@@ -90,13 +91,13 @@ do
_check_log
_print_operation
_cmp_op_output $seq.op $filtered
_cmp_op_output $seqfull.op $filtered
_print_transaction_inode $start_blk
_cmp_output $seq.trans_inode $filtered
_cmp_output $seqfull.trans_inode $filtered
_print_transaction_buf $start_blk
_cmp_output $seq.trans_buf $filtered
_cmp_output $seqfull.trans_buf $filtered
done
# got thru it all so we may have success
tests/xfs/022
+2 -1
View File
@@ -25,6 +25,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -40,7 +41,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/023
+2 -1
View File
@@ -23,6 +23,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -39,7 +40,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/030
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -47,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.repair
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# nuke the superblock, AGI, AGF, AGFL; then try repair the damage
#
tests/xfs/031
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -40,7 +41,7 @@ rm -f $seqres.full
. ./common.filter
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
_check_repair()
{
tests/xfs/033
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -47,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.repair
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# nuke the root, rt bitmap, and rt summary inodes
#
tests/xfs/035
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/036
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/039
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/043
+2 -1
View File
@@ -24,6 +24,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -40,7 +41,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/055
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
tests/xfs/071
+4 -3
View File
@@ -21,6 +21,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -46,11 +47,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
bitsperlong=`src/feature -w`
# link correct .out file
rm -f $seq.out
rm -f $seqfull.out
if [ "$bitsperlong" -eq 32 ]; then
ln -s $seq.out.32 $seq.out
ln -s $seq.out.32 $seqfull.out
else
ln -s $seq.out.64 $seq.out
ln -s $seq.out.64 $seqfull.out
fi
_filter_io()
tests/xfs/082
+5 -4
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -56,7 +57,7 @@ _require_scratch
_require_v2log
# link correct .out file
_link_out_file $seq.op
_link_out_file $seq.op $seqfull.op
echo "*** init FS"
umount $SCRATCH_DEV >/dev/null 2>&1
@@ -120,14 +121,14 @@ for s in sync nosync ; do
:
else
_print_operation
_cmp_op_output $seq.op $filtered
_cmp_op_output $seqfull.op $filtered
fi
_print_transaction_inode $start
_cmp_output $seq.trans_inode $filtered
_cmp_output $seqfull.trans_inode $filtered
_print_transaction_buf $start
_cmp_output $seq.trans_buf $filtered
_cmp_output $seqfull.trans_buf $filtered
done
done
tests/xfs/096
+4 -3
View File
@@ -23,6 +23,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -101,11 +102,11 @@ _require_scratch
_require_v2log
# choose .out file based on internal/external log
rm -f $seq.out
rm -f $seqfull.out
if [ "$USE_EXTERNAL" = yes ]; then
ln -s $seq.external $seq.out
ln -s $seq.external $seqfull.out
else
ln -s $seq.internal $seq.out
ln -s $seq.internal $seqfull.out
fi
# maximum log record size
tests/xfs/146
+2 -1
View File
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
seqres=$RESULT_DIR/$seq
@@ -54,7 +55,7 @@ _supported_fs xfs
_supported_os Linux IRIX
# link correct .out file
_link_out_file $seq.out
_link_out_file $seq.out $seqfull.out
_require_scratch
_scratch_mkfs_xfs >/dev/null 2>&1