thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

tests: ts_mount knows which fs is expected

Browse source 
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2014-05-15 16:56:18 +02:00
parent a23c435ea2
commit d2cc2ba722
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/functions.sh
View file

@ -496,6 +496,8 @@ function ts_mount {
local result local result
local msg local msg
local fs local fs
local fs_exp=$1
shift
out=$($TS_CMD_MOUNT "$@" 2>&1) out=$($TS_CMD_MOUNT "$@" 2>&1)
result=$? result=$?
@ -506,7 +508,7 @@ function ts_mount {
then then
# skip only if reported fs correctly and if it's not available # skip only if reported fs correctly and if it's not available
fs=$(echo "$msg" | sed -n "s/.*type '\(.*\)'$/\1/p") fs=$(echo "$msg" | sed -n "s/.*type '\(.*\)'$/\1/p")
[ -n "$fs" ] \ [ "$fs" = "fs_exp" ] \
&& grep -qe "[[:space:]]${fs}$" /proc/filesystems &>/dev/null \ && grep -qe "[[:space:]]${fs}$" /proc/filesystems &>/dev/null \
|| ts_skip "$msg" || ts_skip "$msg"
fi fi

2
tests/ts/minix/mkfs
View file

@ -37,7 +37,7 @@ ts_log "create mountpoint dir"
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_log "mount the filesystem" ts_log "mount the filesystem"
ts_mount $DEVICE $TS_MOUNTPOINT ts_mount "minix" $DEVICE $TS_MOUNTPOINT
# check it # check it
ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE