diff options
author | Ruediger Meier | 2015-12-10 16:56:11 +0100 |
---|---|---|
committer | Ruediger Meier | 2015-12-10 19:05:25 +0100 |
commit | ee6c0ca65b36f4925f58d787276786252532be6f (patch) | |
tree | 6c0eab369c26ac473c1004d9f54b64d3f4935de7 | |
parent | tests: skip automake's empty "Testsuite summary" (diff) | |
download | kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.gz kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.xz kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.zip |
tests: skip nonroot before checking for progs in PATH
The least annoying and most useful order is this one:
1. check for compiled UL commands
2. check for root
3. check for loop support
4. check for external progs
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
31 files changed, 36 insertions, 31 deletions
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index 1a023a6b8..cc1d9cfeb 100755 --- a/tests/ts/eject/umount +++ b/tests/ts/eject/umount @@ -8,9 +8,9 @@ ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_EJECT" -ts_check_prog "mkfs.ext2" ts_skip_nonroot +ts_check_prog "mkfs.ext2" # # Note that eject --force is required because scsi_debug is diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted index 8edda4b6e..2a55907a7 100755 --- a/tests/ts/fsck/ismounted +++ b/tests/ts/fsck/ismounted @@ -22,10 +22,10 @@ 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 +ts_check_prog "mkfs.ext3" > $TS_OUTPUT diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits index 9048e4dbb..e860724d4 100755 --- a/tests/ts/ipcs/limits +++ b/tests/ts/ipcs/limits @@ -20,7 +20,6 @@ TS_TOPDIR="${0%/*}/../.." TS_DESC="limits overflow" . $TS_TOPDIR/functions.sh - ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 9424fef90..357cab45a 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -13,10 +13,11 @@ 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_skip_nonroot ts_check_prog "mkfs.ext3" ts_check_prog "mkfs.ext4" -ts_skip_nonroot TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test UUID=$($TS_CMD_UUIDGEN) diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index 0f8398f6e..377982fe7 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -13,11 +13,12 @@ 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_skip_nonroot ts_check_prog "mkfs.ext3" ts_check_prog "mkfs.ext4" ts_init_py libmount -ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" [ -x $TESTPROG ] || ts_die "test script missing" diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index d6e7494e7..f6c3024af 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -12,8 +12,9 @@ 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 +ts_check_prog "mkfs.ext4" TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index 00af69554..7603aa7e4 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -11,11 +11,11 @@ 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 +ts_check_prog "mkfs.ext4" +ts_init_py libmount TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" [ -x $TESTPROG ] || ts_die "test script missing" diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags index 662d38b6c..598b11cf6 100755 --- a/tests/ts/libmount/tabfiles-tags +++ b/tests/ts/libmount/tabfiles-tags @@ -5,6 +5,7 @@ TS_DESC="tags" . $TS_TOPDIR/functions.sh ts_init "$*" + ts_skip_nonroot if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py index 47efa70e1..4fd2a2695 100755 --- a/tests/ts/libmount/tabfiles-tags-py +++ b/tests/ts/libmount/tabfiles-tags-py @@ -5,9 +5,11 @@ TS_DESC="tags-py" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_init_py libmount + ts_skip_nonroot +ts_init_py libmount + if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then TS_KNOWN_FAIL="yes" fi diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 2ba5effb6..2570fe3f5 100755 --- a/tests/ts/mount/devname +++ b/tests/ts/mount/devname @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists index 599173002..63f1fab12 100755 --- a/tests/ts/mount/fslists +++ b/tests/ts/mount/fslists @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname index 05704969b..f04e27040 100755 --- a/tests/ts/mount/fstab-devname +++ b/tests/ts/mount/fstab-devname @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label index f55d2056b..e135a2bee 100755 --- a/tests/ts/mount/fstab-devname2label +++ b/tests/ts/mount/fstab-devname2label @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid index 66d9046dc..8fca1b90e 100755 --- a/tests/ts/mount/fstab-devname2uuid +++ b/tests/ts/mount/fstab-devname2uuid @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label index e0d819b9a..8eec212cf 100755 --- a/tests/ts/mount/fstab-label +++ b/tests/ts/mount/fstab-label @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname index 6bb23a5f9..7ad2349d9 100755 --- a/tests/ts/mount/fstab-label2devname +++ b/tests/ts/mount/fstab-label2devname @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid index 08a2927bf..2a759f0c1 100755 --- a/tests/ts/mount/fstab-label2uuid +++ b/tests/ts/mount/fstab-label2uuid @@ -25,10 +25,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index bf00e1355..ba8dafb5b 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" LINKNAME="$TS_OUTDIR/${TS_TESTNAME}_lnk" diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index 6d7c5bf3c..867bc081d 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname index 6c9009720..0196843e3 100755 --- a/tests/ts/mount/fstab-uuid2devname +++ b/tests/ts/mount/fstab-uuid2devname @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label index 77895e31c..641838979 100755 --- a/tests/ts/mount/fstab-uuid2label +++ b/tests/ts/mount/fstab-uuid2label @@ -24,10 +24,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/label b/tests/ts/mount/label index 5e935c032..451a9eb67 100755 --- a/tests/ts/mount/label +++ b/tests/ts/mount/label @@ -25,10 +25,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile index 8278e84b1..989806248 100755 --- a/tests/ts/mount/regfile +++ b/tests/ts/mount/regfile @@ -11,10 +11,10 @@ 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 +ts_check_prog "mkfs.ext3" IMAGE=$(ts_image_init) mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE" diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount index 9fa14b6b8..717692752 100755 --- a/tests/ts/mount/remount +++ b/tests/ts/mount/remount @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext2" # mountpoint [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit index 5e6880c4f..846908400 100755 --- a/tests/ts/mount/rlimit +++ b/tests/ts/mount/rlimit @@ -31,10 +31,10 @@ 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 +ts_check_prog "mkfs.ext3" [ -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 b68a1aa99..038e02572 100755 --- a/tests/ts/mount/shared-subtree +++ b/tests/ts/mount/shared-subtree @@ -9,10 +9,10 @@ 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 +ts_check_prog "mkfs.ext3" [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets index 3b5498fc2..59c7e0394 100755 --- a/tests/ts/mount/umount-alltargets +++ b/tests/ts/mount/umount-alltargets @@ -11,9 +11,9 @@ 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 +ts_check_prog "mkfs.ext2" $TS_CMD_UMOUNT --help | grep -q all-targets [ $? -eq 1 ] && ts_skip "all-targets unsupported" diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive index 2795173f7..29669a88d 100755 --- a/tests/ts/mount/umount-recursive +++ b/tests/ts/mount/umount-recursive @@ -11,9 +11,9 @@ 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 +ts_check_prog "mkfs.ext2" $TS_CMD_UMOUNT --help | grep -q recursive [ $? -eq 1 ] && ts_skip "recursive unsupported" diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid index 6af358c7d..442860ca4 100755 --- a/tests/ts/mount/uuid +++ b/tests/ts/mount/uuid @@ -23,10 +23,10 @@ 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 +ts_check_prog "mkfs.ext3" ts_device_init DEVICE=$TS_LODEV diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx index 91bab4f18..37990d8be 100755 --- a/tests/ts/partx/partx +++ b/tests/ts/partx/partx @@ -22,8 +22,6 @@ TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt" PARTS=3 . $TS_TOPDIR/functions.sh -ts_check_prog "xz" - ts_init "$*" ts_check_test_command "$TS_CMD_PARTX" @@ -31,6 +29,7 @@ ts_check_test_command "$TS_CMD_ADDPART" ts_check_test_command "$TS_CMD_DELPART" ts_skip_nonroot +ts_check_prog "xz" mkdir -p $TS_OUTDIR/images-pt for img in $(ls $TS_IMGDIR/*.img.xz | sort); do diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata index 97f3f2bd0..b4b953755 100755 --- a/tests/ts/sfdisk/movedata +++ b/tests/ts/sfdisk/movedata @@ -24,6 +24,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_SFDISK" ts_skip_nonroot +ts_check_prog "mkfs.ext4" # set global variable TS_DEVICE ts_scsi_debug_init dev_size_mb=100 sector_size=512 |