tests: check commands needed for running a test exist

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

tests/functions.sh

@@ -37,7 +37,12 @@ function ts_report {
 	else
 		echo "$1"
 	fi
+}
 
+function ts_check_test_command {
+	if [ ! -x "$1" ]; then
+		ts_skip "${1##*/} not found"
+	fi
 }
 
 function ts_skip_subtest {
@@ -371,7 +376,7 @@ function ts_die {
 	ts_log "$1"
 	if [ -n "$2" ] && [ -b "$2" ]; then
 		ts_device_deinit "$2"
-		ts_fstab_clean		# for sure... 
+		ts_fstab_clean		# for sure...
 	fi
 	ts_finalize
 }
@@ -384,7 +389,7 @@ function ts_image_md5sum {
 function ts_image_init {
 	local mib=${1:-"5"}	# size in MiBs
 	local img=${2:-"$TS_OUTDIR/${TS_TESTNAME}.img"}
-	
+
 	dd if=/dev/zero of="$img" bs=1M count=$mib &> /dev/null
 	echo "$img"
 	return 0

tests/ts/bitops/swapbytes

@@ -21,6 +21,8 @@ TS_DESC="swap bytes"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_HELPER_BYTESWAP"
+
 $TS_HELPER_BYTESWAP >> $TS_OUTPUT
 
 ts_finalize

tests/ts/blkid/low-probe

@@ -23,9 +23,7 @@ TS_DESC="low-level superblocks probing"
 
 ts_init "$*"
 
-if [ ! -x "$TS_CMD_BLKID" ]; then
-	ts_skip "blkid disabled"
-fi
+ts_check_test_command "$TS_CMD_BLKID"
 
 mkdir -p $TS_OUTDIR/images-fs
 

tests/ts/blkid/lowprobe-pt

@@ -23,9 +23,7 @@ TS_DESC="partitions probing"
 
 ts_init "$*"
 
-if [ ! -x "$TS_HELPER_PARTITIONS" ]; then
-	ts_skip "blkid disabled"
-fi
+ts_check_test_command "$TS_HELPER_PARTITIONS"
 
 mkdir -p $TS_OUTDIR/images-pt
 

tests/ts/blkid/md-raid0-whole

@@ -21,6 +21,10 @@ TS_DESC="MD raid0 (whole-disks)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_BLKID"
+
 ts_skip_nonroot
 [ -x /sbin/mdadm ] || ts_skip "missing mdadm"
 

tests/ts/blkid/md-raid1-part

@@ -21,6 +21,10 @@ TS_DESC="MD raid1 (last partition)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_BLKID"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_scsi_debug_init dev_size_mb=51 sector_size=512)

tests/ts/blkid/md-raid1-whole

@@ -21,6 +21,10 @@ TS_DESC="MD raid1 (whole-disks)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_BLKID"
+
 ts_skip_nonroot
 [ -x /sbin/mdadm ] || ts_skip "missing mdadm"
 

tests/ts/cal/1m

@@ -22,6 +22,8 @@ TS_DESC="1 month"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/1mw

@@ -22,6 +22,8 @@ TS_DESC="1 month with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/3m

@@ -21,6 +21,8 @@ TS_DESC="3 months"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/3mw

@@ -21,6 +21,8 @@ TS_DESC="3 months with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 
 USETERM=$( ts_has_option "useterm" "$*" )

tests/ts/cal/bigyear

@@ -18,6 +18,8 @@ TS_DESC="Year 2147483646"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/bigyearw

@@ -18,6 +18,8 @@ TS_DESC="Year 2147483646 with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/color

@@ -20,6 +20,8 @@ TS_DESC="color"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 # --color output depends on terminal type
 export TERM=linux
 

tests/ts/cal/colorw

@@ -20,6 +20,8 @@ TS_DESC="color with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 # --color output depends on terminal type
 export TERM=linux
 

tests/ts/cal/sep1752

@@ -18,6 +18,8 @@ TS_DESC="September 1752"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/sep1752w

@@ -18,6 +18,8 @@ TS_DESC="September 1752 with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/weekarg

@@ -21,6 +21,8 @@ TS_DESC="week number given as argument"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/weeknum

@@ -21,6 +21,8 @@ TS_DESC="week number corner cases"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 
@@ -29,7 +31,7 @@ USETERM=$( ts_has_option "useterm" "$*" )
 [ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
 ts_log ""
 
-for x in 2001 2002 2003 2009 2010 2011 2012 ; do 
+for x in 2001 2002 2003 2009 2010 2011 2012 ; do
 MYTIME="1 $x"
 
 ts_log "Gregorian - Monday-based week with week numbers - year $x"

tests/ts/cal/year

@@ -21,6 +21,8 @@ TS_DESC="year"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/cal/yearw

@@ -21,6 +21,8 @@ TS_DESC="year with week numbers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CAL"
+
 set -o pipefail
 export TERM=linux
 

tests/ts/col/multibyte

@@ -21,6 +21,8 @@ TS_DESC="multibyte input"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_COL"
+
 cat $TS_SELF/multibyte.data | $TS_CMD_COL > /dev/null  2> $TS_OUTPUT
 
 ts_finalize

tests/ts/colrm/rm2-2

@@ -21,6 +21,8 @@ TS_DESC="basic check"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_COLRM"
+
 printf "a       b\nc\td\nef\b\tg\n" | $TS_CMD_COLRM 2 2 > $TS_OUTPUT 2>&1
 
 ts_finalize

tests/ts/column/fillrow

@@ -21,6 +21,8 @@ TS_DESC="fill row"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_COLUMN"
+
 cd $TS_OUTDIR
 
 $TS_CMD_COLUMN -x -c 50 $TS_SELF/input >> $TS_OUTPUT 2>&1

tests/ts/column/multi-file

@@ -2,7 +2,7 @@
 
 #
 # Copyright (C) 2011 Sami Kerola <kerolasa@iki.fi>
-#               2011 Karel Zak <kzak@redhat.com> 
+#               2011 Karel Zak <kzak@redhat.com>
 #
 # This file is part of util-linux.
 #
@@ -22,6 +22,8 @@ TS_DESC="multiple files"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_COLUMN"
+
 cd $TS_OUTDIR
 
 $TS_CMD_COLUMN -x -c 50 $TS_SELF/input \

tests/ts/column/separator_table

@@ -21,6 +21,8 @@ TS_DESC="separator & table"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_COLUMN"
+
 cd $TS_OUTDIR
 
 $TS_CMD_COLUMN -s 2 -t $TS_SELF/input >> $TS_OUTPUT 2>&1

tests/ts/cramfs/doubles

@@ -20,6 +20,11 @@ TS_DESC="mkfs doubles"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKCRAMFS"
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/cramfs/fsck-endianness

@@ -20,6 +20,10 @@ TS_DESC="fsck endianness"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKCRAMFS"
+ts_check_test_command "$TS_CMD_FSCKCRAMFS"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/cramfs/mkfs

@@ -20,6 +20,12 @@ TS_DESC="mkfs checksums"
 
 . $TS_TOPDIR/functions.sh
 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
 
 set -o pipefail

tests/ts/cramfs/mkfs-endianness

@@ -20,6 +20,9 @@ TS_DESC="mkfs endianness"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKCRAMFS"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/dmesg/console-levels

@@ -18,6 +18,8 @@ TS_DESC="levels"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_DMESG"
+
 for I in {-1..8}; do
 	$TS_CMD_DMESG -F $TS_SELF/input -l $I >> $TS_OUTPUT 2>/dev/null
 done

tests/ts/dmesg/decode

@@ -18,6 +18,8 @@ TS_DESC="decode"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_DMESG"
+
 $TS_CMD_DMESG -x -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize

tests/ts/dmesg/delta

@@ -18,6 +18,8 @@ TS_DESC="delta"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_DMESG"
+
 $TS_CMD_DMESG -d -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize

tests/ts/dmesg/facilities

@@ -18,6 +18,8 @@ TS_DESC="facilities"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_DMESG"
+
 for I in {-1..12}; do
 	$TS_CMD_DMESG -F $TS_SELF/input -f $I >> $TS_OUTPUT 2>/dev/null
 done

tests/ts/eject/umount

@@ -5,10 +5,14 @@ TS_DESC="umount"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_EJECT"
+
 ts_skip_nonroot
 
 #
-# Note that eject --force is required because scsi_debug is 
+# Note that eject --force is required because scsi_debug is
 # not removable device.
 #
 
@@ -35,7 +39,7 @@ p
 w
 EOF
 	udevadm settle
-	mkfs.ext2 -q ${dev}1 
+	mkfs.ext2 -q ${dev}1
 	mkfs.ext2 -q ${dev}2
 	udevadm settle
 }

tests/ts/fdisk/align-512-4K

@@ -25,6 +25,9 @@ TS_DESC="align 512/4K"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3)

tests/ts/fdisk/align-512-4K-63

@@ -25,6 +25,9 @@ TS_DESC="align 512/4K +alignment_offset"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7)

tests/ts/fdisk/align-512-4K-md

@@ -25,6 +25,9 @@ TS_DESC="align 512/4K +MD"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3)

tests/ts/fdisk/align-512-512

@@ -24,6 +24,9 @@ TS_DESC="align 512/512"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_device_init 50)

tests/ts/fdisk/align-512-512-topology

@@ -25,6 +25,9 @@ TS_DESC="align 512/512 +topology"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+
 ts_skip_nonroot
 
 

tests/ts/fdisk/bsd

@@ -22,6 +22,8 @@ TS_DESC="nested BSD"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 FDISK_CMD_CREATE_DOSLABEL="o\n"              # create dos label
 FDISK_CMD_SETID="x\ni\n0x1\nr\n"             # set non-random ID
 FDISK_CMD_WRITE_CLOSE="w\nq\n"               # write to image
@@ -35,7 +37,7 @@ FDISK_CMD_BSD_CREATE_PART="b\nn\na\n\n+1M\n" # add BSD partition 'a', size 1MiB
 FDISK_CMD_BSD_PARTTYPE="b\nt\na\n7\n"        # set partition 'a' to type 4.2BSD
 FDISK_CMD_BSD_LIST_TYPES="b\nl\nq\n"         # list supported PT types and quit
 
-#set -x 
+#set -x
 
 function print_layout {
 	echo -ne "\n---layout----------" >> $TS_OUTPUT

tests/ts/fdisk/gpt

@@ -22,6 +22,8 @@ TS_DESC="GPT"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 FDISK_CMD_CREATE_GPTLABEL="g\n"              # create GPT label
 FDISK_CMD_WRITE_CLOSE="w\nq\n"               # write to image
 
@@ -29,7 +31,7 @@ FDISK_CMD_CHANGE_TYPE_BY_NUM="t\n1\n1\n"     # set 1st partition to EFI System
                                              # set 5th partition to Linux swap
 FDISK_CMD_CHANGE_TYPE_BY_UUID="t\n5\n0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
 
-FDISK_CMD_DELETE_PART="d\n2\n"               # delete 2nd partition	
+FDISK_CMD_DELETE_PART="d\n2\n"               # delete 2nd partition
 FDISK_CMD_CREATE_PART="n\n2\n\n\n"           # create 2nd partition
 
 function print_layout {

tests/ts/fdisk/id

@@ -20,6 +20,8 @@ TS_DESC="MBR - id"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 FDISK_CMD_ID1="x\ni\n0x1\nr\nw\n"
 FDISK_CMD_ID2="x\ni\n0x2\nr\nw\n"
 

tests/ts/fdisk/mbr-dos-mode

@@ -22,6 +22,8 @@ TS_DESC="MBR - dos mode"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 FDISK_CMD_INIT="x\ni\n0x1\nr\n"
 FDISK_CMD_WRITE_CLOSE="w\nq\n"
 FDISK_CMD_CREATE_DOSLABEL="o\n" #create dos label

tests/ts/fdisk/mbr-nondos-mode

@@ -20,6 +20,8 @@ TS_DESC="MBR - non-dos mode"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 # cmd to changes system id to 0x1
 FDISK_CMD_INIT="x\ni\n0x1\nr\n"
 FDISK_CMD_WRITE_CLOSE="w\nq\n"
@@ -27,7 +29,7 @@ FDISK_CMD_CREATE_DOSLABEL="o\n" #create dos label
 FDISK_CMD_CREATE_1PRIMARY="n\np\n\n\n+3M\n" # create primary partition of size 3MiB
 FDISK_CMD_CREATE_2PRIMARY="n\np\n\n\n+2M\n" # create primary partition of size 2MiB
 FDISK_CMD_SET_ACTIVE="a\n1\n" # set first partition active
-FDISK_CMD_CREATE_EXTENDED="n\ne\n\n\n\n" # create extended partition 
+FDISK_CMD_CREATE_EXTENDED="n\ne\n\n\n\n" # create extended partition
 FDISK_CMD_CREATE_LOGICAL="n\nl\n\n+2M\n" # create next logical partition of size 10 sectors
 FDISK_CMD_DELETE_LOGICALS="d\n6\nd\n5\nd\n6\n" # delete middle, head, tail, last partitions
 FDISK_CMD_DELETE_1PRIMARY="d\n1\n" # delete first primary
@@ -40,7 +42,7 @@ function print_layout {
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
 
-#set -x 
+#set -x
 
 ts_log "Initialize empty image"
 TEST_IMAGE_NAME=$(ts_image_init 20)	# 20 MiB

tests/ts/fdisk/oddinput

@@ -20,6 +20,8 @@ TS_DESC="invalid input tests"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 #set -x
 
 ts_log "Initialize empty image"

tests/ts/fdisk/sunlabel

@@ -20,6 +20,8 @@ TS_DESC="sunlabel tests"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FDISK"
+
 FDISK_CMD_INIT="s\n" # create new sunlabel
 FDISK_CMD_WRITE_CLOSE="w\nq\n"
 FDISK_CMD_DELETEALL="d\n1\nd\n2\nd\n3\nd\n4\nd\n5\nd\n6\nd\n7\nd\n8\n" # delete all partitions

tests/ts/fsck/ismounted

@@ -19,6 +19,10 @@ TS_DESC="is mounted"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_MOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/hexdump/format-strings

@@ -22,7 +22,7 @@ FILES="$TS_TOPDIR/ts/hexdump/files"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-[ -x $TS_CMD_HEXDUMP ] || ts_skip "hexdump not compiled"
+ts_check_test_command "$TS_CMD_HEXDUMP"
 
 #885314
 ts_init_subtest "empty-format"

tests/ts/hwclock/systohc

@@ -22,6 +22,9 @@ NTP_SERVER="0.fedora.pool.ntp.org"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_HWCLOCK"
+
 ts_skip_nonroot
 
 PATH='/usr/sbin:/usr/bin:/sbin:/bin'

tests/ts/ipcs/headers

@@ -21,6 +21,8 @@ TS_DESC="headers"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_IPCS"
+
 ts_log "test: shm headers"
 $TS_CMD_IPCS -m -t | grep --after-context=1 "^---"  >> $TS_OUTPUT
 $TS_CMD_IPCS -m -p | grep --after-context=1 "^---"  >> $TS_OUTPUT

tests/ts/ipcs/limits

@@ -22,6 +22,9 @@ TS_DESC="limits overflow"
 . $TS_TOPDIR/functions.sh
 
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_IPCS"
+
 ts_skip_nonroot
 type bc >/dev/null 2>&1 || ts_skip "cannot find bc command"
 

tests/ts/ipcs/limits2

@@ -21,6 +21,9 @@ TS_DESC="basic limits"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_IPCS"
+
 type bc >/dev/null 2>&1 || ts_skip "cannot find bc command"
 
 . $TS_SELF/functions.sh

tests/ts/ipcs/mk-rm-msg

@@ -18,6 +18,10 @@ TS_DESC="mk-rm-msg"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_IPCS"
+ts_check_test_command "$TS_CMD_IPCMK"
+ts_check_test_command "$TS_CMD_IPCRM"
+
 . $TS_SELF/functions.sh
 
 rm -f $TS_OUTDIR/id-msg

tests/ts/ipcs/mk-rm-sem

@@ -18,6 +18,10 @@ TS_DESC="mk-rm-sem"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_IPCS"
+ts_check_test_command "$TS_CMD_IPCMK"
+ts_check_test_command "$TS_CMD_IPCRM"
+
 . $TS_SELF/functions.sh
 
 rm -f $TS_OUTDIR/id-sem

tests/ts/ipcs/mk-rm-shm

@@ -18,6 +18,10 @@ TS_DESC="mk-rm-shm"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_IPCS"
+ts_check_test_command "$TS_CMD_IPCMK"
+ts_check_test_command "$TS_CMD_IPCRM"
+
 . $TS_SELF/functions.sh
 
 rm -f $TS_OUTDIR/id-shm

tests/ts/isosize/print-size

@@ -18,6 +18,8 @@ TS_DESC="print-size"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_ISOSIZE"
+
 gzip -cd $TS_SELF/sample.iso.gz >| $TS_OUTDIR/sample.iso
 
 ts_init_subtest "default_output"

tests/ts/last/ipv6

@@ -18,7 +18,7 @@ TS_DESC="last ipv6"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
+ts_check_test_command "$TS_CMD_LAST"
 
 export LANG=C
 export TZ=GMT

tests/ts/last/last

@@ -18,7 +18,7 @@ TS_DESC="last"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
+ts_check_test_command "$TS_CMD_LAST"
 
 export LANG=C
 export TZ=GMT

tests/ts/libmount/context

@@ -7,8 +7,13 @@ TS_DESC="context"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
-ts_skip_nonroot
 
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
+ts_skip_nonroot
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test
 UUID=$(uuidgen)

tests/ts/libmount/context-py

@@ -7,6 +7,12 @@ TS_DESC="context-py"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_init_py libmount
 ts_skip_nonroot
 

tests/ts/libmount/context-utab

@@ -7,6 +7,10 @@ TS_DESC="context (utab)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_test_command "$TS_CMD_WIPEFS"
 ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"

tests/ts/libmount/context-utab-py

@@ -6,6 +6,11 @@ TS_DESC="context-py (utab)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FDISK"
+ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_test_command "$TS_CMD_WIPEFS"
+
 ts_init_py libmount
 ts_skip_nonroot
 

tests/ts/login/islocal

@@ -21,6 +21,8 @@ TS_DESC="islocal"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_HELPER_ISLOCAL"
+
 $TS_HELPER_ISLOCAL "$TS_SELF/islocal.data" root nobody "" youngman youngman2 \
     abcdefghx nobo long rot al malformed \
     nonl znobody >> $TS_OUTPUT

tests/ts/login/logindefs

@@ -10,6 +10,8 @@ TS_DESC="defs"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_HELPER_LOGINDEFS"
+
 # list all items
 $TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" | sed 's:'$TS_SELF'/::g' >> $TS_OUTPUT
 

tests/ts/look/separator

@@ -34,6 +34,8 @@ TS_DESC="separator"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_LOOK"
+
 $TS_CMD_LOOK apple-pie $TS_TOPDIR/ts/look/words >> $TS_OUTPUT
 ts_finalize
 

tests/ts/losetup/losetup

@@ -21,6 +21,9 @@ TS_DESC="losetup"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_LOSETUP"
+
 ts_skip_nonroot
 
 DEVICE=$(ts_scsi_debug_init dev_size_mb=11)

tests/ts/lscpu/lscpu

@@ -22,6 +22,8 @@ TS_TOPDIR="${0%/*}/../.."
 
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_LSCPU"
+
 for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do
 	name=$(basename $dump .tar.gz)
 	dumpdir="$TS_OUTDIR/dumps"
@@ -29,7 +31,7 @@ for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do
 	ts_init_subtest $name
 	mkdir -p $dumpdir
 
-	tar -C $dumpdir -zxf $dump 
+	tar -C $dumpdir -zxf $dump
 
 	# Architecture information is not applicable with -s.
 	"${TS_CMD_LSCPU}" -s "${dumpdir}/${name}" | \

tests/ts/minix/fsck

@@ -19,12 +19,13 @@ TS_DESC="mkfs checksums"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKMINIX"
+
 ts_skip_nonroot
 
 set -o pipefail
 
-[ -x $TS_CMD_FSCKMINIX ] || ts_skip "fsck.minix not compiled"
-
 IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
 DEVICE=$(ts_device_init)
 

tests/ts/minix/mkfs

@@ -19,12 +19,13 @@ TS_DESC="mkfs"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKMINIX"
+
 ts_skip_nonroot
 
 set -o pipefail
 
-[ -x $TS_CMD_MKMINIX ] || ts_skip "mkfs.minix not compiled"
-
 IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
 DEVICE=$(ts_device_init)
 

tests/ts/misc/fallocate

@@ -18,6 +18,8 @@ TS_DESC="fallocate"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_FALLOCATE"
+
 IMAGE=${TS_OUTDIR}/${TS_TESTNAME}.file
 rm -f $IMAGE
 

tests/ts/misc/getopt

@@ -21,6 +21,8 @@ TS_DESC="getopt"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_GETOPT"
+
 TEMP=$($TS_CMD_GETOPT -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.bash' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar)
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi

tests/ts/misc/ionice

@@ -18,6 +18,8 @@ TS_DESC="ionice"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_IONICE"
+
 $TS_CMD_IONICE -p $$ -n 0 -c 0 >> $TS_OUTPUT 2>&1
 $TS_CMD_IONICE -p $$ -n 3 -c 7 >> $TS_OUTPUT 2>&1
 $TS_CMD_IONICE -p $$ -n 4 -c 7 >> $TS_OUTPUT 2>&1

tests/ts/misc/line

@@ -18,9 +18,7 @@ TS_DESC="line"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-if [ ! -x "$TS_CMD_LINE" ]; then
-	ts_skip "line disabled"
-fi
+ts_check_test_command "$TS_CMD_LINE"
 
 printf "a\nb\n" |
 	$TS_CMD_LINE > $TS_OUTPUT 2>&1

tests/ts/misc/mcookie

@@ -18,6 +18,8 @@ TS_DESC="mcookie"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_MCOOKIE"
+
 $TS_CMD_MCOOKIE -f /etc/services |
 	# The sed will convert only 32 characters long hexadecimal string
 	# to expected string, but nothing else.

tests/ts/misc/rev

@@ -18,6 +18,8 @@ TS_DESC="rev"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_REV"
+
 for I in {0..512}; do printf "%s " {a..z}; done | md5sum >> $TS_OUTPUT 2>&1
 
 for I in {0..512}; do printf "%s " {a..z}; done | \

tests/ts/misc/setarch

@@ -18,6 +18,8 @@ TS_DESC="setarch"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_SETARCH"
+
 $TS_CMD_SETARCH $(uname -m) -vRFZLXBIST3 --uname-2.6 echo "success" >$TS_OUTPUT 2>&1
 
 ts_finalize

tests/ts/misc/setsid

@@ -18,6 +18,8 @@ TS_DESC="setsid"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_SETSID"
+
 $TS_CMD_SETSID echo "success" > $TS_OUTPUT 2>&1
 
 ts_finalize

tests/ts/misc/ul

@@ -18,6 +18,8 @@ TS_DESC="ul"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_UL"
+
 printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" |
 	$TS_CMD_UL -t xterm > $TS_OUTPUT 2>&1
 

tests/ts/misc/whereis

@@ -18,6 +18,8 @@ TS_DESC="whereis"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_WHEREIS"
+
 LS_COUNT=$($TS_CMD_WHEREIS ls | wc -w)
 if [ $LS_COUNT -lt 2 ]; then
 	echo "ls binary nor manual not found?" > $TS_OUTPUT

tests/ts/more/regexp

@@ -18,6 +18,8 @@ TS_DESC="regexp"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_HELPER_MORE"
+
 printf "abba\nbar\nfoo\nxyzzy\n" |
 	$TS_HELPER_MORE +/foo > $TS_OUTPUT 2>&1
 

tests/ts/more/squeeze

@@ -18,6 +18,8 @@ TS_DESC="squeeze"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_HELPER_MORE"
+
 printf "a\n\n\nb\n" |
 	$TS_HELPER_MORE -s > $TS_OUTPUT 2>&1
 

tests/ts/mount/devname

@@ -21,6 +21,10 @@ TS_DESC="by devname"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-broken

@@ -20,6 +20,11 @@ TS_DESC="broken fstab"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_FINDMNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-devname

@@ -20,6 +20,10 @@ TS_DESC="by devname (fstab)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-devname2label

@@ -21,6 +21,10 @@ LABEL="testMountD2L"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-devname2uuid

@@ -20,6 +20,10 @@ TS_DESC="by devname (fstab uuid)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-label

@@ -21,6 +21,10 @@ LABEL="testFstabLabel"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-label2devname

@@ -21,6 +21,10 @@ LABEL="testMountL2D"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-label2uuid

@@ -22,6 +22,10 @@ LABEL="testMountL2U"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-none

@@ -5,6 +5,11 @@ TS_DESC="none"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_FINDMNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-symlink

@@ -21,6 +21,10 @@ TS_DESC="by devname (fstab symlink)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-uuid

@@ -20,6 +20,10 @@ TS_DESC="by uuid (fstab)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-uuid2devname

@@ -20,6 +20,10 @@ TS_DESC="by uuid (fstab devname)"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/fstab-uuid2label

@@ -21,6 +21,10 @@ LABEL="testMountU2L"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/label

@@ -22,6 +22,10 @@ LABEL="testMountLabel"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail

tests/ts/mount/move

@@ -20,6 +20,11 @@ TS_DESC="move"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_FINDMNT"
+
 ts_skip_nonroot
 
 DIR_PRIVATE2="$TS_OUTDIR/mnt-move-private2"

tests/ts/mount/noncanonical

@@ -20,6 +20,9 @@ TS_DESC="non canonical path"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+
 ts_skip_nonroot
 
 [ ! -e "/etc" ] && ts_skip "/etc not such file of directory"

tests/ts/mount/paths

@@ -20,6 +20,9 @@ TS_DESC="basic paths"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+
 ts_skip_nonroot
 
 $TS_CMD_MOUNT -V | grep -q "libmount"

tests/ts/mount/regfile

@@ -8,6 +8,10 @@ TS_DESC="regular file"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 set -o pipefail