svn commit: r260635 - in head/bin: sh/tests test/tests

[Julio Merino]

Author: jmmv
Date: Tue Jan 14 18:45:32 2014
New Revision: 260635
URL: http://svnweb.freebsd.org/changeset/base/260635

Log:
  Replace hand-crafted Kyuafiles with automatic generation.
  
  Redo r260506 by using the new TEST_METADATA functionality of bsd.test.mk
  to mark the sh(1) and test(1) tests as not supporting root.  This is to
  get rid of hand-crafted Kyuafiles for these very simple cases.
  
  MFC after:	5 days

Deleted:
  head/bin/sh/tests/Kyuafile
  head/bin/test/tests/Kyuafile
Modified:
  head/bin/sh/tests/Makefile
  head/bin/test/tests/Makefile

Modified: head/bin/sh/tests/Makefile
==============================================================================
--- head/bin/sh/tests/Makefile	Tue Jan 14 18:39:30 2014	(r260634)
+++ head/bin/sh/tests/Makefile	Tue Jan 14 18:45:32 2014	(r260635)
@@ -3,10 +3,15 @@
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/bin/sh
-KYUAFILE=	yes
 
 TAP_TESTS_SH=	legacy_test
 TAP_TESTS_SH_SED_legacy_test=	-e 's,__SH__,/bin/sh,g'
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 SUBDIR+=	builtins errors execution expansion parameters parser set-e
 

Modified: head/bin/test/tests/Makefile
==============================================================================
--- head/bin/test/tests/Makefile	Tue Jan 14 18:39:30 2014	(r260634)
+++ head/bin/test/tests/Makefile	Tue Jan 14 18:45:32 2014	(r260635)
@@ -3,8 +3,13 @@
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/bin/test
-KYUAFILE=	yes
 
 TAP_TESTS_SH=	legacy_test
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 .include <tap.test.mk>