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/fdisk/align-512-4K-md | |
| 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/fdisk/align-512-4K-md')
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index bd7bb0f0c..09947ff9e 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -27,20 +27,8 @@ TS_DESC="align 512/4K +MD" ts_init "$*" ts_skip_nonroot -modprobe --dry-run --quiet scsi_debug -[ "$?" == 0 ] || ts_skip "missing scsi_debug module" -[ -x /sbin/mdadm ] || ts_skip "missing mdadm" - -rmmod scsi_debug &> /dev/null -modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3 -[ "$?" == 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}" +DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3) +DEVNAME=$(basename $DEVICE) ts_log "Create partitions" $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF @@ -97,6 +85,6 @@ cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT udevadm settle rmmod scsi_debug -ts_fdisk_clean +ts_fdisk_clean $DEVICE ts_finalize |