diff options
| author | Ruediger Meier | 2016-03-13 06:07:16 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2016-03-13 21:47:42 +0100 |
| commit | 0693589b7a095821869c9d2a03289e2e0654758b (patch) | |
| tree | 9bc7e052d66a6a6cc9fa0412023a9de1e009168a /tests/ts/eject | |
| parent | tests: improve skipping of old btrfs-tools (diff) | |
| download | kernel-qcow2-util-linux-0693589b7a095821869c9d2a03289e2e0654758b.tar.gz kernel-qcow2-util-linux-0693589b7a095821869c9d2a03289e2e0654758b.tar.xz kernel-qcow2-util-linux-0693589b7a095821869c9d2a03289e2e0654758b.zip | |
tests: don't use system's mount commands
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/eject')
| -rwxr-xr-x | tests/ts/eject/umount | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index 28b2b99a0..a6e3acff3 100755 --- a/tests/ts/eject/umount +++ b/tests/ts/eject/umount @@ -8,6 +8,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_EJECT" +ts_check_test_command "$TS_CMD_MOUNT" ts_skip_nonroot ts_check_prog "mkfs.ext2" @@ -71,7 +72,7 @@ init_device mkfs.ext2 -q -F $TS_DEVICE udevadm settle mkdir -p $TS_MOUNTPOINT -mount $TS_DEVICE $TS_MOUNTPOINT +$TS_CMD_MOUNT $TS_DEVICE $TS_MOUNTPOINT $TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success" deinit_device ts_finalize_subtest @@ -82,8 +83,8 @@ init_device init_partitions $TS_DEVICE mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 -mount ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 -mount ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 +$TS_CMD_MOUNT ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 +$TS_CMD_MOUNT ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 $TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success" deinit_device ts_finalize_subtest @@ -102,8 +103,8 @@ init_device init_partitions $TS_DEVICE mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 -mount ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 -mount ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 +$TS_CMD_MOUNT ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 +$TS_CMD_MOUNT ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 $TS_CMD_EJECT --force ${TS_DEVICE}1 && ts_log "Success" deinit_device ts_finalize_subtest |