diff options
Diffstat (limited to 'tests/ts/libmount/context')
-rwxr-xr-x | tests/ts/libmount/context | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 35e1a014e..0cc21ec77 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -12,11 +12,13 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" +ts_check_test_command "$TS_CMD_UUIDGEN" ts_skip_nonroot TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test -UUID=$(uuidgen) +UUID=$($TS_CMD_UUIDGEN) + MOUNTPOINT="$TS_MOUNTPOINT" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST @@ -26,11 +28,12 @@ TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" ts_log "Init device" umount $MOUNTPOINT &> /dev/null -DEVICE=$(ts_scsi_debug_init dev_size_mb=100) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=100 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -40,7 +43,7 @@ w q EOF -DEVICE="${DEVICE}1" +DEVICE="${TS_DEVICE}1" sleep 1 udevadm settle |