Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Aug 2014 20:21:12 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r270150 - stable/10/bin/pkill/tests
Message-ID:  <201408182021.s7IKLCbd073240@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers
Date: Mon Aug 18 20:21:12 2014
New Revision: 270150
URL: http://svnweb.freebsd.org/changeset/base/270150

Log:
  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.

Modified:
  stable/10/bin/pkill/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/pkill/tests/Makefile
==============================================================================
--- stable/10/bin/pkill/tests/Makefile	Mon Aug 18 19:27:47 2014	(r270149)
+++ stable/10/bin/pkill/tests/Makefile	Mon Aug 18 20:21:12 2014	(r270150)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408182021.s7IKLCbd073240>