From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Sun, 13 Mar 2016 05:07:16 +0000 (+0100)
Subject: tests: don't use system's mount commands
X-Git-Tag: v2.28-rc2~66^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0693589b7a095821869c9d2a03289e2e0654758b;p=thirdparty%2Futil-linux.git

tests: don't use system's mount commands

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 28b2b99a0f..a6e3acff3b 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
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index f05f66163a..d0d1c3d5f8 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -29,7 +29,7 @@ TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -x $TESTPROG ] || ts_skip "test not compiled"
 
 ts_log "Init device"
-umount $MOUNTPOINT &> /dev/null
+$TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=100
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 19fec3a195..c8b7b4effe 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -31,7 +31,7 @@ TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST
 
 ts_log "Init device"
-umount $MOUNTPOINT &> /dev/null
+$TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=100
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 91a2404258..a50cf67b2f 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -10,6 +10,8 @@ ts_init "$*"
 
 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_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
 
@@ -99,9 +101,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 	mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
 	udevadm settle
 
-	mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
+	$TS_CMD_MOUNT -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
 	btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
-	umount $MOUNTPOINT &> /dev/null
+	$TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 
 	udevadm settle
 
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index ae565ad86d..7994f4fc12 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -9,6 +9,8 @@ ts_init "$*"
 
 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_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
 
@@ -100,9 +102,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 	mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
 	udevadm settle
 
-	mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
+	$TS_CMD_MOUNT -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
 	btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
-	umount $MOUNTPOINT &> /dev/null
+	$TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 
 	udevadm settle