summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorasomers <asomers@FreeBSD.org>2014-08-18 20:21:12 +0000
committerasomers <asomers@FreeBSD.org>2014-08-18 20:21:12 +0000
commit5482ed49237e17f95e34a2e4479f4b875414661d (patch)
tree06b1b3953ed8a7f1b0fee0b2b01057745d936c34 /bin
parentf3589bc4f2abb0df9568ee99050c94bdddda1d9e (diff)
downloadFreeBSD-src-5482ed49237e17f95e34a2e4479f4b875414661d.zip
FreeBSD-src-5482ed49237e17f95e34a2e4479f4b875414661d.tar.gz
MFC r269977
Skip pgrep-j and pkill-j if jail or jls is not installed. Even though jail is part of the base system, it can be disabled by src.conf settings. Therefore, it should be listed as a required program for tests that use it.
Diffstat (limited to 'bin')
-rw-r--r--bin/pkill/tests/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile
index b131d59..a4a2c91 100644
--- a/bin/pkill/tests/Makefile
+++ b/bin/pkill/tests/Makefile
@@ -14,6 +14,7 @@ TAP_TESTS_SH+= pgrep-g_test
TAP_TESTS_SH+= pgrep-i_test
TAP_TESTS_SH+= pgrep-j_test
TEST_METADATA.pgrep-j_test+= required_user="root"
+TEST_METADATA.pgrep-j_test+= required_programs="jail jls"
TAP_TESTS_SH+= pgrep-l_test
TAP_TESTS_SH+= pgrep-n_test
TAP_TESTS_SH+= pgrep-o_test
@@ -31,6 +32,7 @@ TAP_TESTS_SH+= pkill-g_test
TAP_TESTS_SH+= pkill-i_test
TAP_TESTS_SH+= pkill-j_test
TEST_METADATA.pkill-j_test+= required_user="root"
+TEST_METADATA.pkill-j_test+= required_programs="jail jls"
TAP_TESTS_SH+= pkill-s_test
TAP_TESTS_SH+= pkill-t_test
TAP_TESTS_SH+= pkill-x_test
OpenPOWER on IntegriCloud