mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests: introduce a common directory
Introduce a top level common directory and move all the common.* files into it. Because there is now a directory named common, the prefix can be dropped from all the files. Convert all the tests to use this new directory for including common files. for f in common.*; do \ git mv `echo -n "$f " ; echo $f | sed -e 's;n\.;n/;'` \ done Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Phil White <pwhite@sgi.com> [rjohnston@sgi.com reworked for TOT changes] Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
committed by
Rich Johnston
parent
401680a11c
commit
8c4905a42e
@@ -133,9 +133,9 @@ fi
|
|||||||
export FSTYP
|
export FSTYP
|
||||||
|
|
||||||
# we need common.config
|
# we need common.config
|
||||||
if ! . ./common.config
|
if ! . ./common/config
|
||||||
then
|
then
|
||||||
echo "$iam: failed to source common.config"
|
echo "$iam: failed to source common/config"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -266,10 +266,10 @@ then
|
|||||||
list=`echo $list | awk -f randomize.awk`
|
list=`echo $list | awk -f randomize.awk`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# we need common.rc
|
# we need common/rc
|
||||||
if ! . ./common.rc
|
if ! . ./common/rc
|
||||||
then
|
then
|
||||||
echo "check: failed to source common.rc"
|
echo "check: failed to source common/rc"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
# common functions for excersizing hole punches with extent size hints etc.
|
# common functions for excersizing hole punches with extent size hints etc.
|
||||||
|
|
||||||
# source dmap_scratch_mount etc.
|
# source dmap_scratch_mount etc.
|
||||||
. ./common.dmapi
|
. ./common/dmapi
|
||||||
|
|
||||||
_spawn_test_file() {
|
_spawn_test_file() {
|
||||||
echo "# spawning test file with $*"
|
echo "# spawning test file with $*"
|
||||||
@@ -154,7 +154,7 @@ _fsck_opts()
|
|||||||
# we need common.config
|
# we need common.config
|
||||||
if [ "$iam" != "check" ]
|
if [ "$iam" != "check" ]
|
||||||
then
|
then
|
||||||
if ! . ./common.config
|
if ! . ./common/config
|
||||||
then
|
then
|
||||||
echo "$iam: failed to source common.config"
|
echo "$iam: failed to source common.config"
|
||||||
exit 1
|
exit 1
|
||||||
+2
-2
@@ -41,8 +41,8 @@ _cleanup()
|
|||||||
trap "_cleanup ; exit \$status" 0 1 2 3 15
|
trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||||
|
|
||||||
# get standard environment, filters and checks
|
# get standard environment, filters and checks
|
||||||
. ./common.rc
|
. ./common/rc
|
||||||
. ./common.filter
|
. ./common/filter
|
||||||
|
|
||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_supported_fs btrfs
|
_supported_fs btrfs
|
||||||
|
|||||||
+2
-2
@@ -41,8 +41,8 @@ _cleanup()
|
|||||||
trap "_cleanup ; exit \$status" 0 1 2 3 15
|
trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||||
|
|
||||||
# get standard environment, filters and checks
|
# get standard environment, filters and checks
|
||||||
. ./common.rc
|
. ./common/rc
|
||||||
. ./common.filter
|
. ./common/filter
|
||||||
|
|
||||||
_need_to_be_root
|
_need_to_be_root
|
||||||
_supported_fs btrfs
|
_supported_fs btrfs
|
||||||
|
|||||||
+2
-2
@@ -45,8 +45,8 @@ _cleanup()
|
|||||||
}
|
}
|
||||||
|
|
||||||
# get standard environment, filters and checks
|
# get standard environment, filters and checks
|
||||||
. ./common.rc
|
. ./common/rc
|
||||||
. ./common.filter
|
. ./common/filter
|
||||||
|
|
||||||
_need_to_be_root
|
_need_to_be_root
|
||||||
_supported_fs btrfs
|
_supported_fs btrfs
|
||||||
|
|||||||
+2
-2
@@ -52,8 +52,8 @@ _cleanup()
|
|||||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||||
|
|
||||||
# get standard environment, filters and checks
|
# get standard environment, filters and checks
|
||||||
. ./common.rc
|
. ./common/rc
|
||||||
. ./common.filter
|
. ./common/filter
|
||||||
|
|
||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_need_to_be_root
|
_need_to_be_root
|
||||||
|
|||||||
+3
-3
@@ -127,9 +127,9 @@ _rundefrag()
|
|||||||
}
|
}
|
||||||
|
|
||||||
# get standard environment, filters and checks
|
# get standard environment, filters and checks
|
||||||
. ./common.rc
|
. ./common/rc
|
||||||
. ./common.filter
|
. ./common/filter
|
||||||
. ./common.defrag
|
. ./common/defrag
|
||||||
|
|
||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_supported_fs btrfs
|
_supported_fs btrfs
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user