From: Karel Zak <kzak@redhat.com>
Date: Mon, 4 Mar 2019 16:28:15 +0000 (+0100)
Subject: tests: (kill) do not use shell build-in
X-Git-Tag: v2.34-rc1~76
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Futil-linux.git;a=commitdiff_plain;h=2fadcded53add5b5b0ca7071f310a0f37c711c51

tests: (kill) do not use shell build-in

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes
index 2596ef02b6..7a0c959319 100755
--- a/tests/ts/kill/all_processes
+++ b/tests/ts/kill/all_processes
@@ -20,6 +20,11 @@ ts_init "$*"
 
 ts_skip_nonroot
 
+# make sure we do not use shell built-in command
+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then
+	TS_CMD_KILL="/bin/kill"
+fi
+
 ts_check_test_command "$TS_CMD_KILL"
 ts_check_test_command "$TS_HELPER_SIGRECEIVE"
 
diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number
index cde55c9ed8..fd2aaafe0a 100755
--- a/tests/ts/kill/name_to_number
+++ b/tests/ts/kill/name_to_number
@@ -18,6 +18,11 @@ TS_DESC="name_to_number"
 . "$TS_TOPDIR/functions.sh"
 ts_init "$*"
 
+# make sure we do not use shell built-in command
+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then
+	TS_CMD_KILL="/bin/kill"
+fi
+
 ts_check_test_command "$TS_CMD_KILL"
 ts_check_test_command "$TS_HELPER_SIGRECEIVE"
 
diff --git a/tests/ts/kill/options b/tests/ts/kill/options
index 2c82bbccc5..ee9e52f47f 100755
--- a/tests/ts/kill/options
+++ b/tests/ts/kill/options
@@ -18,6 +18,11 @@ TS_DESC="options"
 . "$TS_TOPDIR/functions.sh"
 ts_init "$*"
 
+# make sure we do not use shell built-in command
+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then
+	TS_CMD_KILL="/bin/kill"
+fi
+
 ts_check_test_command "$TS_CMD_KILL"
 ts_check_test_command "$TS_HELPER_SIGRECEIVE"
 
diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid
index c6187f192d..2a2a838ee8 100755
--- a/tests/ts/kill/print_pid
+++ b/tests/ts/kill/print_pid
@@ -18,6 +18,11 @@ TS_DESC="print_pid"
 . "$TS_TOPDIR/functions.sh"
 ts_init "$*"
 
+# make sure we do not use shell built-in command
+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then
+	TS_CMD_KILL="/bin/kill"
+fi
+
 ts_check_test_command "$TS_CMD_KILL"
 ts_check_test_command "$TS_HELPER_SIGRECEIVE"
 
diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue
index 992acf7a62..4727cbfc4f 100755
--- a/tests/ts/kill/queue
+++ b/tests/ts/kill/queue
@@ -18,6 +18,11 @@ TS_DESC="queue"
 . "$TS_TOPDIR/functions.sh"
 ts_init "$*"
 
+# make sure we do not use shell built-in command
+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then
+	TS_CMD_KILL="/bin/kill"
+fi
+
 ts_check_test_command "$TS_CMD_KILL"
 ts_check_test_command "$TS_HELPER_SIGRECEIVE"