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

fstests: canonicalize mount points on every config section

Browse Source 
Create helper _canonicalize_mountpoint() to check and canonicalize
a mount point path.
Use helper to canonicalize TEST_DIR and SCRATCH_MNT after parse
of every config section.

This is needed for overlay base fs mount.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Amir Goldstein
2017-02-28 14:18:30 +02:00
committed by Eryu Guan
parent 5e33bfcf23
commit f20654ac4a
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+21 -13
View File
@@ -457,6 +457,20 @@ _check_device()
fi fi
} }
# check and return a canonical mount point path
_canonicalize_mountpoint()
{
local name=$1
local dir=$2
if [ ! -d "$dir" ]; then
_fatal "common/config: $name ($dir) is not a directory"
fi
# this follows symlinks and removes all trailing "/"s
readlink -e "$dir"
}
# Parse config section options. This function will parse all the configuration # Parse config section options. This function will parse all the configuration
# within a single section which name is passed as an argument. For section # within a single section which name is passed as an argument. For section
# name format see comments in get_config_sections(). # name format see comments in get_config_sections().
@@ -545,10 +559,7 @@ get_next_config() {
fi fi
_check_device TEST_DEV required $TEST_DEV _check_device TEST_DEV required $TEST_DEV
if [ ! -d "$TEST_DIR" ]; then export TEST_DIR=`_canonicalize_mountpoint TEST_DIR $TEST_DIR`
echo "common/config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
exit 1
fi
# a btrfs tester will set only SCRATCH_DEV_POOL, we will put first of its dev # a btrfs tester will set only SCRATCH_DEV_POOL, we will put first of its dev
# to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility # to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility
@@ -563,10 +574,7 @@ get_next_config() {
fi fi
_check_device SCRATCH_DEV optional $SCRATCH_DEV _check_device SCRATCH_DEV optional $SCRATCH_DEV
if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]; then export SCRATCH_MNT=`_canonicalize_mountpoint SCRATCH_MNT $SCRATCH_MNT`
echo "common/config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
exit 1
fi
if [ -n "$USE_EXTERNAL" ]; then if [ -n "$USE_EXTERNAL" ]; then
_check_device TEST_RTDEV optional $TEST_RTDEV _check_device TEST_RTDEV optional $TEST_RTDEV
@@ -593,12 +601,12 @@ if [ -z "$CONFIG_INCLUDED" ]; then
[ -z "$TEST_FS_MOUNT_OPTS" ] && _test_mount_opts [ -z "$TEST_FS_MOUNT_OPTS" ] && _test_mount_opts
[ -z "$MKFS_OPTIONS" ] && _mkfs_opts [ -z "$MKFS_OPTIONS" ] && _mkfs_opts
[ -z "$FSCK_OPTIONS" ] && _fsck_opts [ -z "$FSCK_OPTIONS" ] && _fsck_opts
else
# canonicalize the mount points
# this follows symlinks and removes all trailing "/"s
export TEST_DIR=`_canonicalize_mountpoint TEST_DIR $TEST_DIR`
export SCRATCH_MNT=`_canonicalize_mountpoint SCRATCH_MNT $SCRATCH_MNT`
fi fi
# canonicalize the mount points
# this follows symlinks and removes all trailing "/"s
export TEST_DIR=`readlink -e "$TEST_DIR"`
export SCRATCH_MNT=`readlink -e "$SCRATCH_MNT"`
# make sure this script returns success # make sure this script returns success
/bin/true /bin/true