From: Ruediger Meier Date: Wed, 14 May 2014 21:54:23 +0000 (+0200) Subject: tests: check for mkfs.ext{2,3,4} X-Git-Tag: v2.25-rc1~128^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8930be5a223667775364ee2b95d68d5a08355bbb;p=thirdparty%2Futil-linux.git tests: check for mkfs.ext{2,3,4} Signed-off-by: Ruediger Meier --- diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index 2a684669a2..9058c59ab8 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/fsck/ismounted b/tests/ts/fsck/ismounted index b7b21fc9e0..bff0b81146 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/libmount/context b/tests/ts/libmount/context index 0cc21ec775..7acfb9cdf8 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 14bde41f7e..e8faa7242d 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 c7b94a5bb0..d6e7494e71 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 e03332b37d..8f8c379924 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 dbc9a57f5f..1d9534b05f 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 278d70665f..982cc0001a 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 bc5895afac..ee6b671abb 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 b91127b0d4..4efd7fe062 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 247731668f..2751cd97a0 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 ecaaaffe99..773cb30c84 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 a2664ff3e2..272b66ec68 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 feddcdbdb8..3f29a89151 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 47f6f80f0d..23cdb8fdaa 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 a903d75fa9..dfb97d15df 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 573ed0f59e..789eda4a07 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 5c361c60b0..3b2c4792b9 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 adceb6dd03..d275f41494 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 f680351520..79c2c8754e 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 82f460d0fa..fd908356da 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 b5c3233265..99ede4a75c 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 c11ab7b422..0edace51b0 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 09d4676384..45154835d0 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 9060524e61..995630aff2 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 f393aed129..2795173f7b 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 5b0c90dccd..df1597d530 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