diff options
28 files changed, 28 insertions, 1 deletions
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 46442bb2a..5cf2eea08 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot +ts_check_losetup [ -x /sbin/mdadm ] || ts_skip "missing mdadm" set -o pipefail diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index fcb55c2a4..0ec6c1582 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot +ts_check_losetup [ -x /sbin/mdadm ] || ts_skip "missing mdadm" set -o pipefail diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index 96d6855d7..70c827591 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -24,9 +24,9 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKCRAMFS" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" -ts_check_test_command "$TS_CMD_LOSETUP" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512 index 8057f9339..21037170e 100755 --- a/tests/ts/fdisk/align-512-512 +++ b/tests/ts/fdisk/align-512-512 @@ -28,6 +28,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot +ts_check_losetup DEVICE=$(ts_device_init 50) [ "$?" == 0 ] || ts_die "Cannot init device" diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted index 685601613..b7b21fc9e 100755 --- a/tests/ts/fsck/ismounted +++ b/tests/ts/fsck/ismounted @@ -24,6 +24,7 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_MOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck index 70ad2faa7..cba7c311b 100755 --- a/tests/ts/minix/fsck +++ b/tests/ts/minix/fsck @@ -23,6 +23,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKMINIX" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs index 0159c7b97..f94cb0a4d 100755 --- a/tests/ts/minix/mkfs +++ b/tests/ts/minix/mkfs @@ -23,6 +23,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKMINIX" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 1cab468d8..bc5895afa 100755 --- a/tests/ts/mount/devname +++ b/tests/ts/mount/devname @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname index 4dcc4fc74..b91127b0d 100755 --- a/tests/ts/mount/fstab-devname +++ b/tests/ts/mount/fstab-devname @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label index f8040959e..247731668 100755 --- a/tests/ts/mount/fstab-devname2label +++ b/tests/ts/mount/fstab-devname2label @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid index f5548265e..ecaaaffe9 100755 --- a/tests/ts/mount/fstab-devname2uuid +++ b/tests/ts/mount/fstab-devname2uuid @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label index 24fb80f7a..a2664ff3e 100755 --- a/tests/ts/mount/fstab-label +++ b/tests/ts/mount/fstab-label @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname index b2359a519..feddcdbdb 100755 --- a/tests/ts/mount/fstab-label2devname +++ b/tests/ts/mount/fstab-label2devname @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid index 165426bd7..47f6f80f0 100755 --- a/tests/ts/mount/fstab-label2uuid +++ b/tests/ts/mount/fstab-label2uuid @@ -27,6 +27,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index ddabcd645..a903d75fa 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index 5d3afb706..573ed0f59 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname index 90f7d9177..5c361c60b 100755 --- a/tests/ts/mount/fstab-uuid2devname +++ b/tests/ts/mount/fstab-uuid2devname @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label index 5291688fc..adceb6dd0 100755 --- a/tests/ts/mount/fstab-uuid2label +++ b/tests/ts/mount/fstab-uuid2label @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/label b/tests/ts/mount/label index b0e7ca69a..f68035152 100755 --- a/tests/ts/mount/label +++ b/tests/ts/mount/label @@ -27,6 +27,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount index f983ab37b..b5c323326 100755 --- a/tests/ts/mount/remount +++ b/tests/ts/mount/remount @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_FINDMNT" ts_skip_nonroot +ts_check_losetup # mountpoint [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit index 13064c842..c11ab7b42 100755 --- a/tests/ts/mount/rlimit +++ b/tests/ts/mount/rlimit @@ -33,6 +33,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup [ -L /etc/mtab ] && ts_skip "mtab is symlink" [ "$(stat --format '%s' /etc/mtab)" -gt "1024" ] || ts_skip "mtab is too small" diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree index d512a0007..09d467638 100755 --- a/tests/ts/mount/shared-subtree +++ b/tests/ts/mount/shared-subtree @@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_FINDMNT" ts_skip_nonroot +ts_check_losetup [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid index 0233064cf..5b0c90dcc 100755 --- a/tests/ts/mount/uuid +++ b/tests/ts/mount/uuid @@ -25,6 +25,7 @@ ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname index f8f312105..934455df3 100755 --- a/tests/ts/swapon/devname +++ b/tests/ts/swapon/devname @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_SWAPON" ts_check_test_command "$TS_CMD_SWAPOFF" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/swapon/fixpgsz b/tests/ts/swapon/fixpgsz index f0dafe934..8296951ec 100755 --- a/tests/ts/swapon/fixpgsz +++ b/tests/ts/swapon/fixpgsz @@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_SWAPON" ts_check_test_command "$TS_CMD_SWAPOFF" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig index a4d04110c..c1b4cb6c2 100755 --- a/tests/ts/swapon/fixsig +++ b/tests/ts/swapon/fixsig @@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_SWAPON" ts_check_test_command "$TS_CMD_SWAPOFF" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label index 03cf017ed..329b1af08 100755 --- a/tests/ts/swapon/label +++ b/tests/ts/swapon/label @@ -27,6 +27,7 @@ ts_check_test_command "$TS_CMD_SWAPON" ts_check_test_command "$TS_CMD_SWAPOFF" ts_skip_nonroot +ts_check_losetup set -o pipefail diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid index c80e52fdb..2ea493184 100755 --- a/tests/ts/swapon/uuid +++ b/tests/ts/swapon/uuid @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_SWAPON" ts_check_test_command "$TS_CMD_SWAPOFF" ts_skip_nonroot +ts_check_losetup set -o pipefail |