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