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>

diff --git a/tests/functions.sh b/tests/functions.sh
index 5e2292d9b82ac5fa76f7268ec1b90af6f7d0b8d5..191a310acfe5b53268af22655311d34cb607a785 100644 (file)
--- a/tests/functions.sh
+++ b/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

diff --git a/tests/ts/bitops/swapbytes b/tests/ts/bitops/swapbytes
index 6b843f85e9187e2e8838ca10a2cec538ba40cd8d..798ad53c6c7d959cc7ab8cf12ceac92f31c40f71 100755 (executable)
--- a/tests/ts/bitops/swapbytes
+++ b/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

diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe
index e22d6c849ef7499357219220ef1c4d514857e6f5..eaee0898265199dec035594ba5eb25c64315d5c6 100755 (executable)
--- a/tests/ts/blkid/low-probe
+++ b/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
 

diff --git a/tests/ts/blkid/lowprobe-pt b/tests/ts/blkid/lowprobe-pt
index 8def673f95e3a8ab840f82d96b98b63ffbf85e5a..4e9927b519ac9ce879c414a672aff128938bd09c 100755 (executable)
--- a/tests/ts/blkid/lowprobe-pt
+++ b/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
 

diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index 07ffc584a523170971cea0b7e109c16b270e5b31..46442bb2ac41c6d98602f7cd3a641aa965e499e1 100755 (executable)
--- a/tests/ts/blkid/md-raid0-whole
+++ b/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"
 

diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 43140728caec7f9fc6bb3065fc7ea12b181e5279..0257e15a8cb5ebee21dcd0c2ba7ddcac6af75fcd 100755 (executable)
--- a/tests/ts/blkid/md-raid1-part
+++ b/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)

diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 8743d3d661983c12d2876c214ad952b3be3917d3..fcb55c2a4a5c516288b66c7c550436bd45f77d91 100755 (executable)
--- a/tests/ts/blkid/md-raid1-whole
+++ b/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"
 

diff --git a/tests/ts/cal/1m b/tests/ts/cal/1m
index ddb0129aae5587f142ad74c066eb291de2b79033..295758aadf99ab9161ed71002d6f5a5963585b45 100755 (executable)
--- a/tests/ts/cal/1m
+++ b/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
 

diff --git a/tests/ts/cal/1mw b/tests/ts/cal/1mw
index c258564a44338918bcc7dbdf17ceeff394ce8f2a..66649487a158da262e6eab2775d2ab1d2b7976d5 100755 (executable)
--- a/tests/ts/cal/1mw
+++ b/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
 

diff --git a/tests/ts/cal/3m b/tests/ts/cal/3m
index 64e7c4e384e4061d190008cf1911fb156fa45b77..50f284ec24d57a7fe3f01e4acd60d82976ea8920 100755 (executable)
--- a/tests/ts/cal/3m
+++ b/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
 

diff --git a/tests/ts/cal/3mw b/tests/ts/cal/3mw
index 934cfdc0a1547045a2e273545e7d2a6dd3df595e..5ea951e494ad4a454b4fb63743ef59b9bdbd59b6 100755 (executable)
--- a/tests/ts/cal/3mw
+++ b/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" "$*" )

diff --git a/tests/ts/cal/bigyear b/tests/ts/cal/bigyear
index a01a9defcdc996236f161eee62a81dbdd8fdb489..b5e415ca162aa8f49a1a3b19ab31be3a0180ed38 100755 (executable)
--- a/tests/ts/cal/bigyear
+++ b/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
 

diff --git a/tests/ts/cal/bigyearw b/tests/ts/cal/bigyearw
index a0220bfe37784b2bf577b6df5d7c7bd012adef1b..75a18ddee2eb0a186ed3816f07ef197000e06533 100755 (executable)
--- a/tests/ts/cal/bigyearw
+++ b/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
 

diff --git a/tests/ts/cal/color b/tests/ts/cal/color
index 67883a2ebc31b0b2e11d070c832aa93b3ab384f0..44e9381e290698815935d450ed3041319be382fa 100755 (executable)
--- a/tests/ts/cal/color
+++ b/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
 

diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw
index 8b43461d58a6ca8bc1805399ba7fbd14e3d5ba7e..0092e133e0895014ffde093dc25ae03c396fb74d 100755 (executable)
--- a/tests/ts/cal/colorw
+++ b/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
 

diff --git a/tests/ts/cal/sep1752 b/tests/ts/cal/sep1752
index 4e7fafc490a11582ac4def6bae753df07ed1d055..fa57b9b8ba32887a0a2e744dda33e9e1ebd23c16 100755 (executable)
--- a/tests/ts/cal/sep1752
+++ b/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
 

diff --git a/tests/ts/cal/sep1752w b/tests/ts/cal/sep1752w
index bc792143c5ed7aef3bea1bcfaefd0d69349c9556..b229e8369b4ff6ec8a0acfb987541adccefa254f 100755 (executable)
--- a/tests/ts/cal/sep1752w
+++ b/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
 

diff --git a/tests/ts/cal/weekarg b/tests/ts/cal/weekarg
index dc500ac1928648362fc3a509f9876610501813cb..a7987051c88396410880e10b38eb5cdc36d6d478 100755 (executable)
--- a/tests/ts/cal/weekarg
+++ b/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
 

diff --git a/tests/ts/cal/weeknum b/tests/ts/cal/weeknum
index a3de709c9508e9bc1de7966aedcd6a5430f634ff..0bea00de1375cf40393ae3295183ba587eb722bd 100755 (executable)
--- a/tests/ts/cal/weeknum
+++ b/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"

diff --git a/tests/ts/cal/year b/tests/ts/cal/year
index f6b7cc7d238dbf96f27bd932fc8155650428d681..1204b5ffbc25d7568af2b63b818696b188ac3f65 100755 (executable)
--- a/tests/ts/cal/year
+++ b/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
 

diff --git a/tests/ts/cal/yearw b/tests/ts/cal/yearw
index 9dd673cb7ce577dd281ab40db10731e6a6023492..c05b1c2b7a2d280e031fad13a3d6b9cf56cc913e 100755 (executable)
--- a/tests/ts/cal/yearw
+++ b/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
 

diff --git a/tests/ts/col/multibyte b/tests/ts/col/multibyte
index 5769dd84081d8af983f6fec1e6227ee689e7fb08..e9c02922e7c41272dc519c0fd2e585b40c9c5dd3 100755 (executable)
--- a/tests/ts/col/multibyte
+++ b/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

diff --git a/tests/ts/colrm/rm2-2 b/tests/ts/colrm/rm2-2
index d44e60e2de5fde6c47cbe9a7b3194328df0c9dc1..c13e4ecc64db799164b2ea30c241ed7e16813b5c 100755 (executable)
--- a/tests/ts/colrm/rm2-2
+++ b/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

diff --git a/tests/ts/column/fillrow b/tests/ts/column/fillrow
index 71c40da37c5fb67f25616c939c02abb1542d0915..263a2673f8f638a59130bd035d39e9824a5e2070 100755 (executable)
--- a/tests/ts/column/fillrow
+++ b/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

diff --git a/tests/ts/column/multi-file b/tests/ts/column/multi-file
index 6264bb23d862347eef5c6c976616049f339b041f..76b8686355bc93777f30edd7171e26b85e262c90 100755 (executable)
--- a/tests/ts/column/multi-file
+++ b/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 \

diff --git a/tests/ts/column/separator_table b/tests/ts/column/separator_table
index 9d39090bd61acc7fb404c47c73f7f2d8bb970b09..8be1e20002a5dd26da616dda3f0c3dd2d9835c07 100755 (executable)
--- a/tests/ts/column/separator_table
+++ b/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

diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles
index 3053ab5aff0c669f577b3f0316b9c0544a9e80c4..9b1ce2eb30c19edbda787d031021b0edff363f7c 100755 (executable)
--- a/tests/ts/cramfs/doubles
+++ b/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

diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
index 200445eb02552a190d4e917880b61da0eaa8dabd..33bd18b2aaafbdcc8b5aa22d6f1cca47bba62578 100755 (executable)
--- a/tests/ts/cramfs/fsck-endianness
+++ b/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

diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index bc9375dc08ba1f0903b6e227bbd9b8c9000b1c97..96d6855d7e6efe2fc8c1a1e335d3e885179d0421 100755 (executable)
--- a/tests/ts/cramfs/mkfs
+++ b/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

diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness
index 147cb9c8ee61d262a36a28bd61ccfd77f84a137e..c7df720b64fe92036eb1fde2038a2231153189bc 100755 (executable)
--- a/tests/ts/cramfs/mkfs-endianness
+++ b/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

diff --git a/tests/ts/dmesg/console-levels b/tests/ts/dmesg/console-levels
index 7f21d9ab42d5b19168e7d3e7e1f46b75b36aee19..14c69c980376ffcc4d1d7454e6a2401e0a0b1524 100755 (executable)
--- a/tests/ts/dmesg/console-levels
+++ b/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

diff --git a/tests/ts/dmesg/decode b/tests/ts/dmesg/decode
index 0519a02008b00fb4c98cbc94e8aa3d84ef01d4d2..63f3c5c4767c9149882e7030496d01afa400444a 100755 (executable)
--- a/tests/ts/dmesg/decode
+++ b/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

diff --git a/tests/ts/dmesg/delta b/tests/ts/dmesg/delta
index 2ad2477464c6869cf11f949bf7a85b111561d2cc..da480421d37c489868c3ded4e48d478a1228c6ca 100755 (executable)
--- a/tests/ts/dmesg/delta
+++ b/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

diff --git a/tests/ts/dmesg/facilities b/tests/ts/dmesg/facilities
index e503c1a13281ddeb6e09b5f9b4b733d4e44b647a..7066ae58ede854df6153797646a828fd69228b8e 100755 (executable)
--- a/tests/ts/dmesg/facilities
+++ b/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

diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index b7ea688a86a8919208e1f97800d87ede6177fd9d..e781a7ba648f39ca8c020e8de0c613b33cdb558f 100755 (executable)
--- a/tests/ts/eject/umount
+++ b/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
 }

diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index 2b247f8023fddb234ed70911eac9ac26e5b702ef..5d70fe1face8faa21ac9bc615caa891328841d8d 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K
+++ b/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)

diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index 6190ae1520964355271cfc1568d7b35be3acd97e..65f2a7556a3d171ebe85cc9b32aa8fb0db6f6580 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/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)

diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index be078357f02bf33c5a19cc4d3ea0766f6a1978f8..9a2cb88f7f821ac1d47880f4ae54bf19761ccd1f 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/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)

diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index afcb612efd8d6e345deb401829ed56b879de5883..8057f933959e0e935a156921da26d754280d87d2 100755 (executable)
--- a/tests/ts/fdisk/align-512-512
+++ b/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)

diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 8cc300929b3d85a834b12258d179dd991c6479ca..f988b4e42a5faf07d96e5a849f758fff19a2dd19 100755 (executable)
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/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
 
 

diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 23ac0537e54cc88604615561418541ea96f889c3..7e3c78726f71897d583b8c04134258cdc23e9787 100755 (executable)
--- a/tests/ts/fdisk/bsd
+++ b/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

diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index 75bd006e77538f80d24c6a6b27381d7e850316db..3c174e96875b1a5412c43c1ae954dab522a4dfaf 100755 (executable)
--- a/tests/ts/fdisk/gpt
+++ b/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 {

diff --git a/tests/ts/fdisk/id b/tests/ts/fdisk/id
index 866cf6ecfdc160a547e7afb2ece0f52fd3dbc7c9..a24d793e8ca6969884ffbc51516215a33bc9fdb7 100755 (executable)
--- a/tests/ts/fdisk/id
+++ b/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"
 

diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 45b315b64ecb81a069c8d4c205a32d51019aac4d..6d517ea3e7d59a8495a1d285a857fa69056cd20b 100755 (executable)
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/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

diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 878c1190b40a7bd6938ed2cdc87dfaae16baa3d5..9c38f3affc69a877128c065d8a498ce2132b294d 100755 (executable)
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/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

diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index 2120ce7c815aa4bbc64753e95b7239466bd0319c..8d512200d5c8450f923d9b1d43f8f16aebccc6c5 100755 (executable)
--- a/tests/ts/fdisk/oddinput
+++ b/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"

diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel
index b31ec4f5a024c385611eb38df1f3458d0bc24d2a..5bfbb4f4c1ed9af0bf1ba8ff76f7a444928961b3 100755 (executable)
--- a/tests/ts/fdisk/sunlabel
+++ b/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

diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 6c64390ffd0cbdd13fb36d4eb068b6e141cddb65..6856016135888b095152254082a7128402e0c7bd 100755 (executable)
--- a/tests/ts/fsck/ismounted
+++ b/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

diff --git a/tests/ts/hexdump/format-strings b/tests/ts/hexdump/format-strings
index 8716197cd5e384aafb0afde34ce80d62e7cb8938..229e6513ff85476c6511e41e9eb39701b6123fcc 100755 (executable)
--- a/tests/ts/hexdump/format-strings
+++ b/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"

diff --git a/tests/ts/hwclock/systohc b/tests/ts/hwclock/systohc
index 8dc56b7798078e7b7113579e4958cada2f51826f..8a3eccaf4e8b85dd64e60a9735a3b4d7fd50534e 100755 (executable)
--- a/tests/ts/hwclock/systohc
+++ b/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'

diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers
index 52e108c238c05178c21fd1887c5690a8807192f7..5089ea51276d085c483112a768ab398e698edc76 100755 (executable)
--- a/tests/ts/ipcs/headers
+++ b/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

diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 9e164e5260a9dcbd780d8cb6c2338cb174954b8b..71980b5332b5bf0dd5202ea984d2231a8d826122 100755 (executable)
--- a/tests/ts/ipcs/limits
+++ b/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"
 

diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2
index 39f26d708105371bbe6c9b93862da620f010d1a7..7a7549aa3af3d8051369b4a7ad714e3978fb0e52 100755 (executable)
--- a/tests/ts/ipcs/limits2
+++ b/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

diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg
index 5bea09bed6b673aff79e0ebcf431275ea42fb81a..72f89b8a15ea269187a345584caf30054d41c872 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-msg
+++ b/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

diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem
index 816d306d441149d218e18bb3daa9093f638131a5..315261874314f6e389a2449c83243db92f08a02d 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-sem
+++ b/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

diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm
index 8aa604df979ca67a6096aeb22f3d35b4e4aee0f2..9695ed17cd52bc7d828318dde32e9e6e6da27c1c 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-shm
+++ b/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

diff --git a/tests/ts/isosize/print-size b/tests/ts/isosize/print-size
index d7cf783e42ced1dfb400ed794d02e717e8caba28..277c124831f4b499be5b5942bd43f7569a2de474 100755 (executable)
--- a/tests/ts/isosize/print-size
+++ b/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"

diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6
index 138cf4570429dc31f8935eb509d2d6a9ef6a64ae..b9b4de4ddd160ea6986ee53997d898e1b9901dcd 100755 (executable)
--- a/tests/ts/last/ipv6
+++ b/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

diff --git a/tests/ts/last/last b/tests/ts/last/last
index fa263506ca433813e199cc76d6d3229c597b5348..b6308fca13f29bc2181e9929baecafc344ed86e3 100755 (executable)
--- a/tests/ts/last/last
+++ b/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

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 7d06a28f032a874530d71341286d8d0f469758d5..35e1a014ef7a71bcbecb74935afa5e6ef05e208d 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/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)

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 9535171ba7dbc054b44e2f4f77970494f2cee788..840634413f4935b840262fcd83c1930b45af2c6c 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/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
 

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 9c1487e87da817f2a44a5e382c9bcb2a1ce8315a..4d3e3d7ca3bee4c329144898b910b6f9de8ab993 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/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"

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index c36d8acaede2ea25e9045b10f9622bf913943888..b454ceb542a8dc79a1dab2c90c03136fa0cad4c2 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/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
 

diff --git a/tests/ts/login/islocal b/tests/ts/login/islocal
index a1a7a3b609925212dd349e31fd66f58f4e420a1d..bb372705b2b0692a3cebbdbc2571de5093c6e9d3 100755 (executable)
--- a/tests/ts/login/islocal
+++ b/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

diff --git a/tests/ts/login/logindefs b/tests/ts/login/logindefs
index 0b3b9a44c086a9c544ee9e2b0a2ec64527b95044..2db3f89fa494310df8f2b8c6a1980e3f3a8632e7 100755 (executable)
--- a/tests/ts/login/logindefs
+++ b/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
 

diff --git a/tests/ts/look/separator b/tests/ts/look/separator
index 967dec40183c800de669e4f22b3cfa6ec97317a8..c6028e3147943764d82d57c63c590164feed2e3a 100755 (executable)
--- a/tests/ts/look/separator
+++ b/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
 

diff --git a/tests/ts/losetup/losetup b/tests/ts/losetup/losetup
index 64eb03888a4d0f114e3fefff44451d43ff530d02..234c58f6f251505ea6bb115388b4aa2c8d85d5e7 100755 (executable)
--- a/tests/ts/losetup/losetup
+++ b/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)

diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu
index 2b874716566bca10fd8952f814be1d50157c3e04..4a98b86042fa0bf6bd913d70b33ab13778ae5e35 100755 (executable)
--- a/tests/ts/lscpu/lscpu
+++ b/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}" | \

diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck
index 2b290b0f8f20f5284e3f652ae43a5f031fbe361d..70ad2faa7673ec92ec74335d2dc6380c582e4587 100755 (executable)
--- a/tests/ts/minix/fsck
+++ b/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)
 

diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index 00d5a863dde128fb39cd71b05abcc11a97ba5387..0159c7b9748b4d8675371708297b54a3119b55a4 100755 (executable)
--- a/tests/ts/minix/mkfs
+++ b/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)
 

diff --git a/tests/ts/misc/fallocate b/tests/ts/misc/fallocate
index b39794a1f97249504a6c72dbfc993dc11dc2d594..cbb25d8e87e46b758d4761df86d9f94e32e4f4e1 100755 (executable)
--- a/tests/ts/misc/fallocate
+++ b/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
 

diff --git a/tests/ts/misc/getopt b/tests/ts/misc/getopt
index 082e411709a03b4c68969b6e104e6041f1ec9d05..715ec36ec386819ed01634bebd6dc5f9231c4c02 100755 (executable)
--- a/tests/ts/misc/getopt
+++ b/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

diff --git a/tests/ts/misc/ionice b/tests/ts/misc/ionice
index 29f4d61649da9022d75d674fba5ac80b71a249a9..32b22598a10bae8bc4b589d12ba5174caf8d1000 100755 (executable)
--- a/tests/ts/misc/ionice
+++ b/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

diff --git a/tests/ts/misc/line b/tests/ts/misc/line
index 2acf2d217abf71035f08b5650abb203f336c80ca..a17ee28cceee2ca5dc9c104f61e3bea4701ecd32 100755 (executable)
--- a/tests/ts/misc/line
+++ b/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

diff --git a/tests/ts/misc/mcookie b/tests/ts/misc/mcookie
index c5051bceab978c7995ca5763d7811e566ff0538e..96e3cc70aad18a86d27e03a336ec6f13b34d776f 100755 (executable)
--- a/tests/ts/misc/mcookie
+++ b/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.

diff --git a/tests/ts/misc/rev b/tests/ts/misc/rev
index 5b95f289aeb5fe186279f9238eb5041f38885bd5..a3d45e6a9e768b25be3e41fce7c6e3c8023dc5c5 100755 (executable)
--- a/tests/ts/misc/rev
+++ b/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 | \

diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
index 62e00707c68442ad181ca45284412b77e30f85d7..912050958927724762d845a4a1d104725ab504dc 100755 (executable)
--- a/tests/ts/misc/setarch
+++ b/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

diff --git a/tests/ts/misc/setsid b/tests/ts/misc/setsid
index a758c1273265b236fe2ee56d48e15253180d5ed6..baef70d432d64f6a6e7e4ace29ef9b5d941aab05 100755 (executable)
--- a/tests/ts/misc/setsid
+++ b/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

diff --git a/tests/ts/misc/ul b/tests/ts/misc/ul
index 974a7f25ea800652b89cfa0d76cb938c34aeebe5..2c2c1da54241bbf6c87b4b9dd8f91507b076e7a8 100755 (executable)
--- a/tests/ts/misc/ul
+++ b/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
 

diff --git a/tests/ts/misc/whereis b/tests/ts/misc/whereis
index 98441193bb5d610ac4972e3a05d9cbc8a0e0286b..ee7ec2701935aad2b8a16c6590d8b2204562879f 100755 (executable)
--- a/tests/ts/misc/whereis
+++ b/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

diff --git a/tests/ts/more/regexp b/tests/ts/more/regexp
index 947f5562410b81ebd339d7bc01f9853feaeee9e3..67c6f62810c0b7084291ee21c4561065a2b9f5db 100755 (executable)
--- a/tests/ts/more/regexp
+++ b/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
 

diff --git a/tests/ts/more/squeeze b/tests/ts/more/squeeze
index 16b537e3a4652c3379f27477ed8dfbf90bca6fea..d5b4a6ab7f0e613642f13c978aedccca2db18b47 100755 (executable)
--- a/tests/ts/more/squeeze
+++ b/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
 

diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index 016a16e0ec4d76b2567bfb43dec4154189153972..1cab468d896444a47083ab4593b4caedf64637cb 100755 (executable)
--- a/tests/ts/mount/devname
+++ b/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

diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index 52245350315cf0167d70aa1962f35890a5645c0d..5934c22d37c4e3f39d573a509e5e63d62d976b43 100755 (executable)
--- a/tests/ts/mount/fstab-broken
+++ b/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

diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 9cf73e008c97167f881928ad4959a76c19c9db5a..4dcc4fc74d95f8a4dfbaa785b7815ad0a5bf3cd0 100755 (executable)
--- a/tests/ts/mount/fstab-devname
+++ b/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

diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index 63e8126f9182856fd8fdbe16adcc96dbd257868c..f8040959eb703037a62689cccfe062e0c45c6780 100755 (executable)
--- a/tests/ts/mount/fstab-devname2label
+++ b/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

diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 8cdf946e58bcb19e630a0da0044f03bfe6b9696e..f5548265e89c276d2e1a0d05a2b3824eb90e6dd1 100755 (executable)
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/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

diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 5e8a97a0f2da3e3c931fa7813876a9c7c43c4ee1..24fb80f7a7e65647e5e074372ed93377008a3128 100755 (executable)
--- a/tests/ts/mount/fstab-label
+++ b/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

diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 1bb8d042cfdb31366e4c20a0971e83be54760476..b2359a519b62091b410a7e136d531af10726ffc0 100755 (executable)
--- a/tests/ts/mount/fstab-label2devname
+++ b/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

diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index ba63a38ea260d9593cc1f467dfa6fb3ef87acc44..165426bd75b97fc5ae363ad95bfa0c840020e64e 100755 (executable)
--- a/tests/ts/mount/fstab-label2uuid
+++ b/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

diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
index 1a8fa78e4421422da35739446c7cb1c7f5cd4fa9..64eb48bbfb90b9a6141c31cf69bf4c8e5027f76e 100755 (executable)
--- a/tests/ts/mount/fstab-none
+++ b/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

diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index c8d5eec72efaa7d8fffdd3c4e145b134bdca8acc..ddabcd645c589428ac3264d627781deeff5f61af 100755 (executable)
--- a/tests/ts/mount/fstab-symlink
+++ b/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

diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index a0394a4ff1a5e15a9b800b5f72d179a2f0698f12..5d3afb7067ba3535d8c352002c0d5ed6ba95c37d 100755 (executable)
--- a/tests/ts/mount/fstab-uuid
+++ b/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

diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 57229114684869ba64e0c5ddfdbc02254053557e..90f7d91772ac9fce0df558a95a9977d033552659 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/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

diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index 098f43badf4ff0026cf0f6ad2e8236f7f5c2596b..5291688fc606f64db273ab874891145eb25e250f 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2label
+++ b/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

diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 2dda82530f61a1323f05d351679a1d6b23a0552c..b0e7ca69aa2b0a890da5c0808be652a4b2f1d9d0 100755 (executable)
--- a/tests/ts/mount/label
+++ b/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

diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index dc130d48430a982113d2a86f85bb77ebe7d9fdba..524488777316d14bf169dd75e257c1cb380f2f6a 100755 (executable)
--- a/tests/ts/mount/move
+++ b/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"

diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical
index a5402d3d919ed448cffc66650b4f860e88280098..a311577f0bbcee762aa7e57ad2860bf3997e1d7a 100755 (executable)
--- a/tests/ts/mount/noncanonical
+++ b/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"

diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths
index 8a6ed352ba6ffd6f2e4c72577ff1106f4c92671e..edc283757a19fbeccb88361189f115716dd68f60 100755 (executable)
--- a/tests/ts/mount/paths
+++ b/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"

diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index b342ececd95ffac76b8a5e71d22cc902a893f779..9f24c721a982c69a7c95911b3235da7fd9aa9643 100755 (executable)
--- a/tests/ts/mount/regfile
+++ b/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

diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index c6c772f918ae8cbe7d8cbffc328eaf8663b0c042..f983ab37bea10e2667caab265d9c420578c82b5b 100755 (executable)
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -20,6 +20,10 @@ TS_DESC="remount"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_FINDMNT"
+
 ts_skip_nonroot
 
 # mountpoint

diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index dc7a2c821d19cf8a7ff724e2be95ad1ae1430b93..13064c842c0acd1aeea87feae04fa39af7cbfadd 100755 (executable)
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -28,6 +28,10 @@ TS_DESC="rlimit-fsize"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
+
 ts_skip_nonroot
 
 [ -L /etc/mtab ] && ts_skip "mtab is symlink"

diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index f234a289ee0e89c1d6955ce52b6cd0593d464dfc..d512a0007b4f7fc1f30afcd016b0e0aa283b1a45 100755 (executable)
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -5,6 +5,11 @@ TS_DESC="shared-subtree"
 
 . $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
 
 [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index 633f23df814a085f437f8fe7a8c8e6b918adfbe5..21edd6507825115f2e077723ccc83c40a496e2da 100755 (executable)
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -21,6 +21,9 @@ MOUNTER="/sbin/mount.mytest"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MOUNT"
+
 ts_skip_nonroot
 
 cat > $MOUNTER <<\EOF

diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index e6a284727488164a04c27de4a512aa9698326112..e3b5aec9a90e83705a8ce686ded3566e49c99e5f 100755 (executable)
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -7,6 +7,11 @@ TS_DESC="umount-all-targets"
 
 . $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_FDISK"
+
 ts_skip_nonroot
 
 $TS_CMD_UMOUNT --help | grep -q all-targets

diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 83d6dee3cfc0592b9c994cbacdf331e867ea16dd..d55f6128533a779e297c3ac9f233016f77de5f6b 100755 (executable)
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -7,6 +7,11 @@ TS_DESC="umount-recursive"
 
 . $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_FDISK"
+
 ts_skip_nonroot
 
 $TS_CMD_UMOUNT --help | grep -q recursive

diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 14df0b140a4a69fda9f9e469165684bec4c6283f..0233064cf15c94845e3d7fba36ec9511e23201c2 100755 (executable)
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -20,6 +20,10 @@ TS_DESC="by 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

diff --git a/tests/ts/namei/logic b/tests/ts/namei/logic
index b216ee7cc6313818ff74af03b5bfa6fbac0c0a4c..df48b76204f0a79f9d9c936fa5e1a72a70cff84d 100755 (executable)
--- a/tests/ts/namei/logic
+++ b/tests/ts/namei/logic
@@ -21,6 +21,8 @@ TS_DESC="basic functionality"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_NAMEI"
+
 cd $TS_OUTDIR
 
 mkdir -p namei1/namei2

diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index 74600cbc208f4516ac1425babda9d7c0a8f992fd..bc612b0a4f853ec17b13d672bb7602d4697f6c1d 100755 (executable)
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -24,9 +24,12 @@ PARTS=3
 . $TS_TOPDIR/functions.sh
 
 ts_init "$*"
-ts_skip_nonroot
 
-[ ! -x "$TS_CMD_PARTX" ] && ts_skip "partx disabled"
+ts_check_test_command "$TS_CMD_PARTX"
+ts_check_test_command "$TS_CMD_ADDPART"
+ts_check_test_command "$TS_CMD_DELPART"
+
+ts_skip_nonroot
 
 mkdir -p $TS_OUTDIR/images-pt
 for img in $(ls $TS_IMGDIR/*.img.bz2 | sort); do

diff --git a/tests/ts/schedutils/cpuset b/tests/ts/schedutils/cpuset
index 9872e270c442b72690f00e2f89e8e175ba326d5f..f1df597947cbe05b28ea8a4983c30c34bc913da0 100755 (executable)
--- a/tests/ts/schedutils/cpuset
+++ b/tests/ts/schedutils/cpuset
@@ -20,6 +20,8 @@ TS_DESC="cpuset"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_CPUSET"
+
 MASKS=" 0x00000001 \
        0x00000002 \
        0x00000003 \

diff --git a/tests/ts/script/race b/tests/ts/script/race
index 98ac56a47f0d1353405360ed1506b127ed4fbc0c..ef7e83f12c8e55729f02810fbb881bf40c2cc8e4 100755 (executable)
--- a/tests/ts/script/race
+++ b/tests/ts/script/race
@@ -22,6 +22,8 @@ TS_DESC="race conditions"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_SCRIPT"
+
 bingofile="$TS_OUTDIR/${TS_TESTNAME}-bingo"
 
 set -o pipefail

diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname
index 10fcc4282ee8c12a4ec936f99c8c57a2dbf34b52..f8f312105b6d6eb4ccdb975b365f203409ff0664 100755 (executable)
--- a/tests/ts/swapon/devname
+++ b/tests/ts/swapon/devname
@@ -20,6 +20,11 @@ TS_DESC="by devname"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKSWAP"
+ts_check_test_command "$TS_CMD_SWAPON"
+ts_check_test_command "$TS_CMD_SWAPOFF"
+
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts/swapon/fixpgsz b/tests/ts/swapon/fixpgsz
index 53f8833f53d11b2f7ac24cf4f62fb88118ef5e2a..f0dafe934697e299f7e0e805c5cbcdb2e0ddffe8 100755 (executable)
--- a/tests/ts/swapon/fixpgsz
+++ b/tests/ts/swapon/fixpgsz
@@ -5,6 +5,11 @@ TS_DESC="fix page size"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKSWAP"
+ts_check_test_command "$TS_CMD_SWAPON"
+ts_check_test_command "$TS_CMD_SWAPOFF"
+
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig
index d7ba6562589005a899158ca37428abd8e5312d85..a4d04110c0ad9f77b13ec634633be805200133f8 100755 (executable)
--- a/tests/ts/swapon/fixsig
+++ b/tests/ts/swapon/fixsig
@@ -5,6 +5,11 @@ TS_DESC="fix signature"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKSWAP"
+ts_check_test_command "$TS_CMD_SWAPON"
+ts_check_test_command "$TS_CMD_SWAPOFF"
+
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 5f9599cd2e4fd6e24f3c228d54c20691c9985daa..03cf017eda1c06a1463421b6e4aa32199d6f7d15 100755 (executable)
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -21,6 +21,11 @@ LABEL="testSwapLabel"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKSWAP"
+ts_check_test_command "$TS_CMD_SWAPON"
+ts_check_test_command "$TS_CMD_SWAPOFF"
+
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index 85835063084d686d75bbc32bb44613d70671d787..c80e52fdbeecf56c79fb67f552c28132e061e7f6 100755 (executable)
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -20,6 +20,11 @@ TS_DESC="by uuid"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKSWAP"
+ts_check_test_command "$TS_CMD_SWAPON"
+ts_check_test_command "$TS_CMD_SWAPOFF"
+
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts/tailf/simple b/tests/ts/tailf/simple
index 60257aee647bc9cb58a6a2193f359567a8d2e602..955844d1c8e477fbc4933eecfe718ad57429da61 100755 (executable)
--- a/tests/ts/tailf/simple
+++ b/tests/ts/tailf/simple
@@ -18,6 +18,8 @@ TS_DESC="simple"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_TAILF"
+
 INPUT=$TS_OUTDIR/$TS_TESTNAME.input
 
 rm -f $INPUT

diff --git a/tests/ts/utmpdump/ipv6tobin b/tests/ts/utmpdump/ipv6tobin
index cb52e513b71696ff6d8f04dc41579637891f0d02..fac6fb9a490907c8825d84c9edee6da5101e423a 100755 (executable)
--- a/tests/ts/utmpdump/ipv6tobin
+++ b/tests/ts/utmpdump/ipv6tobin
@@ -18,6 +18,8 @@ TS_DESC="IPv6 to binary"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_UTMPDUMP"
+
 export LANG=C
 export TZ=GMT
 $TS_CMD_UTMPDUMP -r $TS_SELF/ipv6txt >| $TS_OUTPUT 2>/dev/null

diff --git a/tests/ts/utmpdump/ipv6totxt b/tests/ts/utmpdump/ipv6totxt
index 560806c5b3254ba1e5ed6a3ef382410402553c43..b9da8abd7cbb5e3aae8ef95dde90051a1d97ed1a 100755 (executable)
--- a/tests/ts/utmpdump/ipv6totxt
+++ b/tests/ts/utmpdump/ipv6totxt
@@ -18,6 +18,8 @@ TS_DESC="IPv6 to text"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_UTMPDUMP"
+
 export LANG=C
 export TZ=GMT
 $TS_CMD_UTMPDUMP $TS_SELF/ipv6bin >| $TS_OUTPUT 2>/dev/null

diff --git a/tests/ts/utmpdump/to-binary b/tests/ts/utmpdump/to-binary
index dcfe6ea1e04ec9cadb753c62d582e70c71752229..e774915e7b9e958761e531adea66d25837882819 100755 (executable)
--- a/tests/ts/utmpdump/to-binary
+++ b/tests/ts/utmpdump/to-binary
@@ -18,6 +18,8 @@ TS_DESC="to-binary"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_UTMPDUMP"
+
 export LANG=C
 export TZ=GMT
 $TS_CMD_UTMPDUMP -r $TS_SELF/text >| $TS_OUTPUT 2>/dev/null

diff --git a/tests/ts/utmpdump/to-text b/tests/ts/utmpdump/to-text
index 56f411a5d864388fcfa8522a40ce23389da527c5..e98215067afb2d54e535dc8f1b57edad673a18d8 100755 (executable)
--- a/tests/ts/utmpdump/to-text
+++ b/tests/ts/utmpdump/to-text
@@ -18,6 +18,8 @@ TS_DESC="to-text"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_UTMPDUMP"
+
 export LANG=C
 export TZ=GMT
 $TS_CMD_UTMPDUMP $TS_SELF/binary >| $TS_OUTPUT 2>/dev/null

diff --git a/tests/ts/wipefs/wipefs b/tests/ts/wipefs/wipefs
index e6ace2166bf26f9d989167c7a7163999abe07282..4bd174800fd875297c46750d0d604c0ed49b28e7 100755 (executable)
--- a/tests/ts/wipefs/wipefs
+++ b/tests/ts/wipefs/wipefs
@@ -7,6 +7,8 @@ TS_DESC="wipefs"
 ts_skip_nonroot
 ts_init "$*"
 
+ts_check_test_command "$TS_CMD_WIPEFS"
+
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50 num_parts=2)
 
 # remove old backups