summaryrefslogtreecommitdiffstats
path: root/bin/test
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-01-14 18:45:32 +0000
committerjmmv <jmmv@FreeBSD.org>2014-01-14 18:45:32 +0000
commitd43a2cacc245a5c84d102e42c7a0a81195d49ebf (patch)
treee97b7754612b7b508d8f7256c20ff24c2be53b3f /bin/test
parent7fc96b015280b2bc652e2f865d674a2215a23550 (diff)
downloadFreeBSD-src-d43a2cacc245a5c84d102e42c7a0a81195d49ebf.zip
FreeBSD-src-d43a2cacc245a5c84d102e42c7a0a81195d49ebf.tar.gz
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
Diffstat (limited to 'bin/test')
-rw-r--r--bin/test/tests/Kyuafile12
-rw-r--r--bin/test/tests/Makefile7
2 files changed, 6 insertions, 13 deletions
diff --git a/bin/test/tests/Kyuafile b/bin/test/tests/Kyuafile
deleted file mode 100644
index b2e4b32..0000000
--- a/bin/test/tests/Kyuafile
+++ /dev/null
@@ -1,12 +0,0 @@
--- $FreeBSD$
-
-syntax(2)
-
-test_suite("FreeBSD")
-
--- 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
-tap_test_program{name="legacy_test", required_user="unprivileged"}
diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile
index dfffbed..be32dbb 100644
--- a/bin/test/tests/Makefile
+++ b/bin/test/tests/Makefile
@@ -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>
OpenPOWER on IntegriCloud