Author: asomers
Date: Thu Aug 14 14:59:40 2014
New Revision: 269977
URL: http://svnweb.freebsd.org/changeset/base/269977

Log:
  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.
  
  CR:           D603
  MFC after:    3 days
  Sponsored by: Spectra Logic

Modified:
  head/bin/pkill/tests/Makefile

Modified: head/bin/pkill/tests/Makefile
==============================================================================
--- head/bin/pkill/tests/Makefile       Thu Aug 14 14:22:12 2014        
(r269976)
+++ head/bin/pkill/tests/Makefile       Thu Aug 14 14:59:40 2014        
(r269977)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to