From: Karel Zak Date: Tue, 19 Apr 2011 11:39:35 +0000 (+0200) Subject: tests: don't run mount/regfile test on old kernel X-Git-Tag: v2.20-rc1~324 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f9d92499a35e0165cf863e71500ab3288cfa67a;p=thirdparty%2Futil-linux.git tests: don't run mount/regfile test on old kernel The /sys/.../loop/backing_file is available since 2.6.37. Signed-off-by: Karel Zak --- diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile index 270bebd2d1..05a28ee63e 100755 --- a/tests/ts/mount/regfile +++ b/tests/ts/mount/regfile @@ -19,9 +19,16 @@ mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE" $TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts) + grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot found $TS_MOUNTPOINT in /proc/mounts" -$TS_CMD_UMOUNT $IMAGE || ts_die "Cannot umount $IMAGE" +if [ -f "/sys/block/$(basename $DEVICE)/loop" ]; then + $TS_CMD_UMOUNT $IMAGE || ts_die "Cannot umount $IMAGE" +else + $TS_CMD_UMOUNT $TS_MOUNTPOINT &> /dev/null + ts_skip "too old kernel" +fi grep -q "$TS_MOUNTPOINT" /proc/mounts && ts_die "$TS_MOUNTPOINT still in /proc/mounts"