diff options
| author | Ruediger Meier | 2014-05-15 16:56:18 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-05-16 12:07:26 +0200 |
| commit | d2cc2ba722d5fd0775855bf6ae977bb66a31c09c (patch) | |
| tree | db0abf268bdb5fb748111255fa25d7a289a03991 | |
| parent | tests: ts_mount validates error message (diff) | |
| download | kernel-qcow2-util-linux-d2cc2ba722d5fd0775855bf6ae977bb66a31c09c.tar.gz kernel-qcow2-util-linux-d2cc2ba722d5fd0775855bf6ae977bb66a31c09c.tar.xz kernel-qcow2-util-linux-d2cc2ba722d5fd0775855bf6ae977bb66a31c09c.zip | |
tests: ts_mount knows which fs is expected
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
| -rw-r--r-- | tests/functions.sh | 4 | ||||
| -rwxr-xr-x | tests/ts/minix/mkfs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index cc3dc054a..384fccdc8 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -496,6 +496,8 @@ function ts_mount { local result local msg local fs + local fs_exp=$1 + shift out=$($TS_CMD_MOUNT "$@" 2>&1) result=$? @@ -506,7 +508,7 @@ function ts_mount { then # skip only if reported fs correctly and if it's not available fs=$(echo "$msg" | sed -n "s/.*type '\(.*\)'$/\1/p") - [ -n "$fs" ] \ + [ "$fs" = "fs_exp" ] \ && grep -qe "[[:space:]]${fs}$" /proc/filesystems &>/dev/null \ || ts_skip "$msg" fi diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs index f664e3525..86230f77c 100755 --- a/tests/ts/minix/mkfs +++ b/tests/ts/minix/mkfs @@ -37,7 +37,7 @@ ts_log "create mountpoint dir" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_log "mount the filesystem" -ts_mount $DEVICE $TS_MOUNTPOINT +ts_mount "minix" $DEVICE $TS_MOUNTPOINT # check it ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE |