mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
btrfs: add function _require_fssum()
To avoid repeating detection of fssum presence in many btrfs tests, as suggested by Dave Chinner. Also exported the variable "here" from the main control script, to avoid repeating its declaration in every single testcase file. Also removed the declaration of "here" from btrfs test cases that require the fssum program only. Removing it from all other test cases will be a separate change. Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
b50473c849
commit
2dd0dbe3f8
@@ -32,7 +32,7 @@ diff="diff -u"
|
||||
showme=false
|
||||
have_test_arg=false
|
||||
randomize=false
|
||||
here=`pwd`
|
||||
export here=`pwd`
|
||||
xfile=""
|
||||
|
||||
# start the initialisation work now
|
||||
|
||||
@@ -2158,6 +2158,12 @@ _require_cp_reflink()
|
||||
_notrun "This test requires a cp with --reflink support."
|
||||
}
|
||||
|
||||
_require_fssum()
|
||||
{
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
}
|
||||
|
||||
# Given 2 files, verify that they have the same mapping but different
|
||||
# inodes - i.e. an undisturbed reflink
|
||||
# Silent if so, make noise if not
|
||||
|
||||
+1
-4
@@ -31,7 +31,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
status=1
|
||||
|
||||
@@ -52,11 +51,9 @@ _need_to_be_root
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
_require_fssum
|
||||
_require_seek_data_hole
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
workout()
|
||||
|
||||
Regular → Executable
+1
-4
@@ -26,7 +26,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
tmp_dir=send_temp_$seq
|
||||
|
||||
@@ -51,9 +50,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
_require_fssum
|
||||
|
||||
_scratch_mkfs > /dev/null 2>&1
|
||||
|
||||
|
||||
+1
-4
@@ -36,7 +36,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
status=1 # failure is the default!
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
@@ -54,11 +53,9 @@ _cleanup()
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
_require_fssum
|
||||
_need_to_be_root
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
|
||||
+1
-4
@@ -32,7 +32,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
status=1 # failure is the default!
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
@@ -50,11 +49,9 @@ _cleanup()
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
_require_fssum
|
||||
_need_to_be_root
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
|
||||
+1
-4
@@ -35,7 +35,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
status=1 # failure is the default!
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
@@ -53,11 +52,9 @@ _cleanup()
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
_require_fssum
|
||||
_need_to_be_root
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
|
||||
+1
-4
@@ -35,7 +35,6 @@ seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=`mktemp -d`
|
||||
status=1 # failure is the default!
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
@@ -53,11 +52,9 @@ _cleanup()
|
||||
_supported_fs btrfs
|
||||
_supported_os Linux
|
||||
_require_scratch
|
||||
_require_fssum
|
||||
_need_to_be_root
|
||||
|
||||
FSSUM_PROG=$here/src/fssum
|
||||
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
|
||||
Reference in New Issue
Block a user