diff options
| author | Karel Zak | 2013-04-12 16:36:33 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-12 16:36:33 +0200 |
| commit | 618ec053fe2d1353eb1c15ebf98c1f4ef9b08ed1 (patch) | |
| tree | e749c7c352768ed4492c1f6a3a2ed097d91bf9e2 /tests/ts/libmount/context | |
| parent | libmount: add debug message to guess FS function (diff) | |
| download | kernel-qcow2-util-linux-618ec053fe2d1353eb1c15ebf98c1f4ef9b08ed1.tar.gz kernel-qcow2-util-linux-618ec053fe2d1353eb1c15ebf98c1f4ef9b08ed1.tar.xz kernel-qcow2-util-linux-618ec053fe2d1353eb1c15ebf98c1f4ef9b08ed1.zip | |
tests: consolidate scsi_debug usage
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount/context')
| -rwxr-xr-x | tests/ts/libmount/context | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index c1c1fb74b..0c3bce986 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -16,29 +16,16 @@ MOUNTPOINT="$TS_MOUNTPOINT" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST -#set -x - [ -x $TESTPROG ] || ts_skip "test not compiled" -modprobe --dry-run --quiet scsi_debug -[ "$?" == 0 ] || ts_skip "missing scsi_debug module" - ts_log "Init device" umount $MOUNTPOINT &> /dev/null -rmmod scsi_debug &> /dev/null -modprobe scsi_debug dev_size_mb=100 -[ "$?" == 0 ] || ts_die "Cannot init device" -sleep 3 - -DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}') -[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device" - -DEVICE="/dev/${DEVNAME}" -udevadm settle +DEVICE=$(ts_scsi_debug_init dev_size_mb=100) +DEVNAME=$(basename $DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> /dev/null 2>&1 <<EOF +$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF n p 1 @@ -48,9 +35,17 @@ w q EOF -DEVICE="/dev/${DEVNAME}1" +DEVICE="${DEVICE}1" + +sleep 1 udevadm settle +grep -q $DEVNAME /proc/partitions +if [ $? -ne 0 ]; then + rmmod scsi_debug + ts_skip "no partition!" +fi + ts_log "Create filesystem" mkfs.ext4 -L "$LABEL" -U "$UUID" $DEVICE &> /dev/null @@ -60,6 +55,7 @@ export LIBMOUNT_MTAB=$TS_OUTPUT.mtab > $LIBMOUNT_MTAB udevadm settle +ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null |