tests: check for mkfs.ext{2,3,4}

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

diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 2a684669a2dcbaebb3851dd86aa7bdd5cad2f46e..9058c59ab8b90bb3b15cd474239b0fe76b34f276 100755 (executable)
--- 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/fsck/ismounted b/tests/ts/fsck/ismounted
index b7b21fc9e0edd8c92c583cf6d5f09726a182ef57..bff0b8114631e5d34de4ecff7069d3c81bf89a39 100755 (executable)
--- 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/libmount/context b/tests/ts/libmount/context
index 0cc21ec7754e91e3cbd11676a43df00e89130f2f..7acfb9cdf86e1bf6a9b96bb1495a4d0e4939eecc 100755 (executable)
--- 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 14bde41f7e3645818384664c0ebcdd1cba1be0d4..e8faa7242d5f07583f7eb38f4a36864e3566441a 100755 (executable)
--- 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 c7b94a5bb004ddfb9ceffe1454efe223e5543fa1..d6e7494e7111dc54b84efed508937852fda552ae 100755 (executable)
--- 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 e03332b37dc2aab6e610dad0f2e88dd58db5d743..8f8c3799248820f4ff85338ae07d87c1c65b5974 100755 (executable)
--- 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 dbc9a57f5f3b4c099b612fdbd72773b94f99b5cb..1d9534b05f02751475ebab703e95e491fe4b6dab 100755 (executable)
--- 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 278d70665fdbd0fba53a26becd6afcfe6912037c..982cc0001a6bbc8607d341c1c0032d352769d83b 100755 (executable)
--- 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 bc5895afac1c59bda06697530c4da1724ecfc5fc..ee6b671abb372e5af6eb4aa4b03d280231ec6210 100755 (executable)
--- 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 b91127b0d482b14ec007160d099543f7c01f6f2d..4efd7fe062c047148b3919e42b419066f22cb282 100755 (executable)
--- 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 247731668fb28ea7585552eeab5d1435637201eb..2751cd97a09abf8d167a406fe0796699d97fc25b 100755 (executable)
--- 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 ecaaaffe998d00dd9aec09393d4c369f8b1c9e7d..773cb30c84dfb3f489c13b17197feb5fb8084a10 100755 (executable)
--- 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 a2664ff3e2aac02ee4dd3f0f0310220e861622f4..272b66ec6856e383bc4f5626b3f3169426aa226e 100755 (executable)
--- 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 feddcdbdb8cf07da26663fe31a5bc8db51b9c21e..3f29a8915105d322013aa3d4c4148fe9c6951e28 100755 (executable)
--- 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 47f6f80f0d12466d2d1fdea6dc2ccf3ae3a4ed69..23cdb8fdaa210ebff7d45cc1624196afbbfd3654 100755 (executable)
--- 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 a903d75fa9a383313a0f3ce88d1d1ef12eb43ecc..dfb97d15df526e767903cbecd56fcc593256c8b9 100755 (executable)
--- 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 573ed0f59e4ff4f31e5cfbb8394bbebdeb40d92b..789eda4a07ea89526c05d631788ed70fc6ed426e 100755 (executable)
--- 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 5c361c60b0dd666a8b3f11a72947cc60fc61cbac..3b2c4792b9f9f2b64bd2f7a7b4299d6a42f3f502 100755 (executable)
--- 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 adceb6dd030f31303eba6ceaddbf5e42a3fb1f8c..d275f41494337461d60b394f654ddc146b490bcc 100755 (executable)
--- 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 f680351520153b971d419de7be4d48a11c332e49..79c2c8754e343bc07bd2107d805530f169487986 100755 (executable)
--- 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 82f460d0faafe627886edec7a5d9f045ad8a739e..fd908356da8f2d4a27bfe9b6c1b6e9fc8f7f9ae8 100755 (executable)
--- 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 b5c32332659b23599eed45360b1a69e9d4f41592..99ede4a75c2fefabefad1a84265201a14f340b2b 100755 (executable)
--- 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 c11ab7b422c60e23989303e7d14215f167f1ea34..0edace51b00eea9609a5355fd5a215426856f16b 100755 (executable)
--- 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 09d46763844687273ea2d1f79e79df9dd558c2e3..45154835d00c3e587af7badfe8d67c9f1ab9dac6 100755 (executable)
--- 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 9060524e61ffcb7aa5c5fef230158f576881a05b..995630aff26bdaf84439a38a9f326760f399591d 100755 (executable)
--- 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 f393aed129abd1b3e1713c5bc9f96dc779f69fb6..2795173f7b1a8fa4c7679d5fad49d22693d9224f 100755 (executable)
--- 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 5b0c90dccdad1af5847df2a5ce102cbf2bffb4cf..df1597d530d8fed837790e31c2c05934b181f666 100755 (executable)
--- 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