Merge branch 'tests-check-prog' of https://github.com/rudimeier/util-linux

* 'tests-check-prog' of https://github.com/rudimeier/util-linux:
  tests: check for mkfs.ext{2,3,4}
  tests: consolidate some checks for commands
  tests: add function ts_check_prog

36 files changed, 55 insertions, 22 deletions

diff --git a/tests/functions.sh b/tests/functions.sh
index 3888f0dcd..66dcb0d70 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -45,6 +45,11 @@ function ts_check_test_command {
 	fi
 }
 
+function ts_check_prog {
+	local cmd=$1
+	type "$cmd" >/dev/null 2>&1 || ts_skip "missing in PATH: $cmd"
+}
+
 function ts_check_losetup {
 	local tmp
 	ts_check_test_command "$TS_CMD_LOSETUP"
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index 5cf2eea08..e2359619b 100755
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_BLKID"
 
 ts_skip_nonroot
 ts_check_losetup
-[ -x /sbin/mdadm ] || ts_skip "missing mdadm"
+ts_check_prog "mdadm"
 
 set -o pipefail
 
@@ -43,10 +43,10 @@ DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img)
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
-/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null
+mdadm -q -S ${MD_DEVICE} &> /dev/null
 
 ts_log "Create RAID device"
-/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \
+mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \
 	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1
 
 ts_log "Create partitions on RAID device"
@@ -75,7 +75,7 @@ ts_log "Probe second RAID member"
 $TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT
 
 ts_log "Stop RAID device"
-/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
+mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
 
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 6a59037e4..ce3a687c7 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_BLKID"
 
 ts_skip_nonroot
+ts_check_prog "mdadm"
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=51 sector_size=512
@@ -62,8 +63,8 @@ MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
 ts_log "Create RAID1 device"
-/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null
-/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
+mdadm -q -S ${MD_DEVICE} &> /dev/null
+mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
 	    --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1
 udevadm settle
 
@@ -76,7 +77,7 @@ $TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 2>&1 | sort >> $TS_OUTPUT
 ts_log "Probe second RAID member"
 $TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT
 
-/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
+mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
 rmmod scsi_debug
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 0ec6c1582..611ead3b7 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_BLKID"
 
 ts_skip_nonroot
 ts_check_losetup
-[ -x /sbin/mdadm ] || ts_skip "missing mdadm"
+ts_check_prog "mdadm"
 
 set -o pipefail
 
@@ -43,10 +43,10 @@ DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img)
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
-/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null
+mdadm -q -S ${MD_DEVICE} &> /dev/null
 
 ts_log "Create RAID device"
-/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
+mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
 	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1
 
 ts_log "Create partitions on RAID device"
@@ -75,7 +75,7 @@ ts_log "Probe second RAID member"
 $TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT
 
 ts_log "Stop RAID device"
-/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
+mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
 
diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config
index 308c34b2d..5ae83a3bb 100755
--- a/tests/ts/build-sys/config
+++ b/tests/ts/build-sys/config
@@ -11,8 +11,8 @@ TS_OPTIONAL="yes"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-[ -x /usr/bin/readelf ] || ts_skip "readelf(1) not found"
-[ -x /usr/bin/file ] || ts_skip "file(1) not found"
+ts_check_prog "readelf"
+ts_check_prog "file"
 
 config_gen_dir="$top_srcdir/tools"
 . $config_gen_dir/config-gen-functions.sh
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 2a684669a..9058c59ab 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_prog "mkfs.ext2"
 
 ts_skip_nonroot
 
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index acb6186a6..11a67699b 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -29,6 +29,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_FDISK"
 
 ts_skip_nonroot
+ts_check_prog "mdadm"
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
@@ -58,8 +59,8 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>&1
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
-/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null
-/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \
+mdadm -q -S ${MD_DEVICE} &> /dev/null
+mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \
 	    --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1
 
 udevadm settle
@@ -84,7 +85,7 @@ udevadm settle
 ts_log "Alignment offsets (MD):"
 cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT 2>&1
 
-/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
+mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
 rmmod scsi_debug
diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index b7b21fc9e..bff0b8114 100755
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -22,6 +22,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
diff --git a/tests/ts/hwclock/systohc b/tests/ts/hwclock/systohc
index 8a3eccaf4..a2df4fd9b 100755
--- a/tests/ts/hwclock/systohc
+++ b/tests/ts/hwclock/systohc
@@ -26,9 +26,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_HWCLOCK"
 
 ts_skip_nonroot
-
-PATH='/usr/sbin:/usr/bin:/sbin:/bin'
-type ntpdate >/dev/null 2>&1 || ts_skip "cannot find ntpdate command"
+ts_check_prog "ntpdate"
 
 set -o pipefail
 
diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 71980b533..851d4edfa 100755
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -26,7 +26,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_IPCS"
 
 ts_skip_nonroot
-type bc >/dev/null 2>&1 || ts_skip "cannot find bc command"
+ts_check_prog "bc"
 
 . $TS_SELF/functions.sh
 
diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2
index ea90174b9..23331985e 100755
--- a/tests/ts/ipcs/limits2
+++ b/tests/ts/ipcs/limits2
@@ -23,8 +23,7 @@ TS_DESC="basic limits"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_IPCS"
-
-type bc >/dev/null 2>&1 || ts_skip "cannot find bc command"
+ts_check_prog "bc"
 
 . $TS_SELF/functions.sh
 
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 0cc21ec77..7acfb9cdf 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -13,6 +13,8 @@ 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_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext4"
 
 ts_skip_nonroot
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 14bde41f7..e8faa7242 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -13,6 +13,8 @@ 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_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext4"
 
 ts_init_py libmount
 ts_skip_nonroot
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index c7b94a5bb..d6e7494e7 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -12,6 +12,7 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
+ts_check_prog "mkfs.ext4"
 ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index e03332b37..8f8c37992 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
+ts_check_prog "mkfs.ext4"
 
 ts_init_py libmount
 ts_skip_nonroot
diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index dbc9a57f5..1d9534b05 100755
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -10,6 +10,7 @@ ts_skip_nonroot
 TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
 
 [ -x $TESTPROG ] || ts_skip "test not compiled"
+ts_check_prog "mkfs.ext3"
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=50 sector_size=512
diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index 278d70665..982cc0001 100755
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -9,6 +9,7 @@ ts_init_py libmount
 ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB"
+ts_check_prog "mkfs.ext3"
 
 PYDBG="$PYTHON -m pdb"
 
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