summaryrefslogtreecommitdiffstats
path: root/tests/ts/mount
diff options
context:
space:
mode:
authorRuediger Meier2014-05-14 23:54:23 +0200
committerRuediger Meier2014-05-15 12:51:24 +0200
commit8930be5a223667775364ee2b95d68d5a08355bbb (patch)
tree48df950889781ec21985e219aebea6c605425eca /tests/ts/mount
parenttests: consolidate some checks for commands (diff)
downloadkernel-qcow2-util-linux-8930be5a223667775364ee2b95d68d5a08355bbb.tar.gz
kernel-qcow2-util-linux-8930be5a223667775364ee2b95d68d5a08355bbb.tar.xz
kernel-qcow2-util-linux-8930be5a223667775364ee2b95d68d5a08355bbb.zip
tests: check for mkfs.ext{2,3,4}
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/mount')
-rwxr-xr-xtests/ts/mount/devname1
-rwxr-xr-xtests/ts/mount/fstab-devname1
-rwxr-xr-xtests/ts/mount/fstab-devname2label1
-rwxr-xr-xtests/ts/mount/fstab-devname2uuid1
-rwxr-xr-xtests/ts/mount/fstab-label1
-rwxr-xr-xtests/ts/mount/fstab-label2devname1
-rwxr-xr-xtests/ts/mount/fstab-label2uuid1
-rwxr-xr-xtests/ts/mount/fstab-symlink1
-rwxr-xr-xtests/ts/mount/fstab-uuid1
-rwxr-xr-xtests/ts/mount/fstab-uuid2devname1
-rwxr-xr-xtests/ts/mount/fstab-uuid2label1
-rwxr-xr-xtests/ts/mount/label1
-rwxr-xr-xtests/ts/mount/regfile1
-rwxr-xr-xtests/ts/mount/remount1
-rwxr-xr-xtests/ts/mount/rlimit1
-rwxr-xr-xtests/ts/mount/shared-subtree1
-rwxr-xr-xtests/ts/mount/umount-alltargets1
-rwxr-xr-xtests/ts/mount/umount-recursive1
-rwxr-xr-xtests/ts/mount/uuid1
19 files changed, 19 insertions, 0 deletions
diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index bc5895afa..ee6b671ab 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index b91127b0d..4efd7fe06 100755
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index 247731668..2751cd97a 100755
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index ecaaaffe9..773cb30c8 100755
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index a2664ff3e..272b66ec6 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index feddcdbdb..3f29a8915 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 47f6f80f0..23cdb8fda 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -25,6 +25,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index a903d75fa..dfb97d15d 100755
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 573ed0f59..789eda4a0 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 5c361c60b..3b2c4792b 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index adceb6dd0..d275f4149 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -24,6 +24,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index f68035152..79c2c8754 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -25,6 +25,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index 82f460d0f..fd908356d 100755
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -11,6 +11,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index b5c323326..99ede4a75 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_prog "mkfs.ext2"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index c11ab7b42..0edace51b 100755
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -31,6 +31,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index 09d467638..45154835d 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -9,6 +9,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 9060524e6..995630aff 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -11,6 +11,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
ts_check_test_command "$TS_CMD_FDISK"
+ts_check_prog "mkfs.ext2"
ts_skip_nonroot
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index f393aed12..2795173f7 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -11,6 +11,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
ts_check_test_command "$TS_CMD_FDISK"
+ts_check_prog "mkfs.ext2"
ts_skip_nonroot
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 5b0c90dcc..df1597d53 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -23,6 +23,7 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MOUNT"
ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup