diff options
author | Julio Merino <jmmv@FreeBSD.org> | 2014-01-14 18:45:32 +0000 |
---|---|---|
committer | Julio Merino <jmmv@FreeBSD.org> | 2014-01-14 18:45:32 +0000 |
commit | 9622238c09a17f74ca930020f2420952e324a155 (patch) | |
tree | e97b7754612b7b508d8f7256c20ff24c2be53b3f | |
parent | d935b542635e02a0dcc67ec66f2912226a50f71d (diff) | |
download | src-9622238c09a17f74ca930020f2420952e324a155.tar.gz src-9622238c09a17f74ca930020f2420952e324a155.zip |
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
Notes
Notes:
svn path=/head/; revision=260635
-rw-r--r-- | bin/sh/tests/Kyuafile | 12 | ||||
-rw-r--r-- | bin/sh/tests/Makefile | 7 | ||||
-rw-r--r-- | bin/test/tests/Kyuafile | 12 | ||||
-rw-r--r-- | bin/test/tests/Makefile | 7 |
4 files changed, 12 insertions, 26 deletions
diff --git a/bin/sh/tests/Kyuafile b/bin/sh/tests/Kyuafile deleted file mode 100644 index b2e4b320dd89..000000000000 --- a/bin/sh/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/sh/tests/Makefile b/bin/sh/tests/Makefile index 94bcba6062d8..f6ddb8a07277 100644 --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -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 diff --git a/bin/test/tests/Kyuafile b/bin/test/tests/Kyuafile deleted file mode 100644 index b2e4b320dd89..000000000000 --- 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 dfffbedd735a..be32dbb29bf8 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> |