From 9bccbbf06a91f4e7bf5c0cddadf18265dc2e9e4b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 4 Mar 2019 16:42:30 +0100 Subject: [PATCH 15/19] tests: add missing ts_check_test_command calls Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1681062 Upstream: http://github.com/karelzak/util-linux/commit/19e00ec9e9e9c36305cf2dd163d0333e2d72c671 Signed-off-by: Karel Zak --- tests/ts/fsck/ismounted | 2 ++ tests/ts/hexdump/format-strings | 1 + tests/ts/hexdump/highlighting | 1 + tests/ts/ipcs/limits | 1 + tests/ts/ipcs/limits2 | 1 + tests/ts/ipcs/mk-rm-msg | 1 + tests/ts/ipcs/mk-rm-sem | 1 + tests/ts/ipcs/mk-rm-shm | 1 + tests/ts/misc/swaplabel | 1 + 9 files changed, 10 insertions(+) diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted index 2a55907a7..7d1fe6273 100755 --- a/tests/ts/fsck/ismounted +++ b/tests/ts/fsck/ismounted @@ -22,6 +22,8 @@ ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_MOUNT" +ts_check_test_command "$TS_CMD_UMOUNT" +ts_check_test_command "$TS_HELPER_ISMOUNTED" ts_skip_nonroot ts_check_losetup diff --git a/tests/ts/hexdump/format-strings b/tests/ts/hexdump/format-strings index e6f9229a5..f2dc6a89b 100755 --- a/tests/ts/hexdump/format-strings +++ b/tests/ts/hexdump/format-strings @@ -23,6 +23,7 @@ FILES="$TS_TOPDIR/ts/hexdump/files" ts_init "$*" ts_check_test_command "$TS_CMD_HEXDUMP" +ts_check_test_command "$TS_HELPER_SYSINFO" # on big endian systems some of the subtests have different expected output BYTE_ORDER=$($TS_HELPER_SYSINFO byte-order) diff --git a/tests/ts/hexdump/highlighting b/tests/ts/hexdump/highlighting index cf78f7b96..e57757978 100755 --- a/tests/ts/hexdump/highlighting +++ b/tests/ts/hexdump/highlighting @@ -25,6 +25,7 @@ ADDRFMT='-e "%07.7_Ax\n"' ts_init "$*" ts_check_test_command "$TS_CMD_HEXDUMP" +ts_check_test_command "$TS_HELPER_SYSINFO" # on big endian systems some of the subtests have different expected output BYTE_ORDER=$($TS_HELPER_SYSINFO byte-order) diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits index 7b64b3c17..671f23c77 100755 --- a/tests/ts/ipcs/limits +++ b/tests/ts/ipcs/limits @@ -23,6 +23,7 @@ TS_DESC="limits overflow" ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" +ts_check_test_command "$TS_HELPER_SYSINFO" ts_skip_nonroot ts_check_prog "bc" diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2 index d23c41a35..77ad70f9b 100755 --- a/tests/ts/ipcs/limits2 +++ b/tests/ts/ipcs/limits2 @@ -23,6 +23,7 @@ TS_DESC="basic limits" ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" +ts_check_test_command "$TS_HELPER_SYSINFO" ts_check_prog "bc" . $TS_SELF/functions.sh diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg index 25460e25d..de3682e87 100755 --- a/tests/ts/ipcs/mk-rm-msg +++ b/tests/ts/ipcs/mk-rm-msg @@ -21,6 +21,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" ts_check_test_command "$TS_CMD_IPCMK" ts_check_test_command "$TS_CMD_IPCRM" +ts_check_test_command "$TS_HELPER_SYSINFO" . $TS_SELF/functions.sh diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem index 61e0cfdef..d7b505f7c 100755 --- a/tests/ts/ipcs/mk-rm-sem +++ b/tests/ts/ipcs/mk-rm-sem @@ -21,6 +21,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" ts_check_test_command "$TS_CMD_IPCMK" ts_check_test_command "$TS_CMD_IPCRM" +ts_check_test_command "$TS_HELPER_SYSINFO" . $TS_SELF/functions.sh diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm index 838fb3f21..c21547b82 100755 --- a/tests/ts/ipcs/mk-rm-shm +++ b/tests/ts/ipcs/mk-rm-shm @@ -21,6 +21,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" ts_check_test_command "$TS_CMD_IPCMK" ts_check_test_command "$TS_CMD_IPCRM" +ts_check_test_command "$TS_HELPER_SYSINFO" . $TS_SELF/functions.sh diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 646304508..22858b0ac 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -20,6 +20,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKSWAP" ts_check_test_command "$TS_CMD_SWAPLABEL" +ts_check_test_command "$TS_HELPER_SYSINFO" # fallocate does not work on most file systems function fallocate_or_skip() -- 2.20.1