diff options
author | ngie <ngie@FreeBSD.org> | 2016-01-06 20:06:15 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-01-06 20:06:15 +0000 |
commit | 03aed74e9c37f31301d107b9678a5e10a1f1dd9e (patch) | |
tree | a92d97da56a2d5ac00bb8f8dc2ed17611b5d4372 | |
parent | e9a63348ce6f35658889512c008589d9a4544bd8 (diff) | |
download | FreeBSD-src-03aed74e9c37f31301d107b9678a5e10a1f1dd9e.zip FreeBSD-src-03aed74e9c37f31301d107b9678a5e10a1f1dd9e.tar.gz |
MFC r292650,r292651:
r292650:
Move mac_bsdextended check up before running the test_libugidfw_strings testcases
I realize that these tests could be run before mac_bsdextended is loaded, but
it would overcomplicate things to special case handle the testcases before doing
the mac_bsdextended(4) feature check
The testcases will be split up so they can be run separately in the near future
r292651:
Delete the comment about running `test_libugidfw_strings` before testing
`mac_is_present` so it doesn't accidentally confuse people
-rw-r--r-- | tests/sys/mac/bsdextended/ugidfw_test.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tests/sys/mac/bsdextended/ugidfw_test.c b/tests/sys/mac/bsdextended/ugidfw_test.c index 7c1dc2a..aab8553 100644 --- a/tests/sys/mac/bsdextended/ugidfw_test.c +++ b/tests/sys/mac/bsdextended/ugidfw_test.c @@ -208,16 +208,6 @@ main(void) return (0); } - printf("1..%lu\n", nitems(test_users) + nitems(test_groups) + - 3 * nitems(test_strings) + 2); - - /* - * We can test some parts of the library without the MAC Framework - * and policy loaded, so run those tests before calling - * mac_is_present(). - */ - test_libugidfw_strings(); - switch (mac_is_present("bsdextended")) { case -1: printf("1..0 # SKIP mac_is_present failed: %s\n", @@ -231,6 +221,11 @@ main(void) return (0); } + printf("1..%lu\n", nitems(test_users) + nitems(test_groups) + + 3 * nitems(test_strings) + 2); + + test_libugidfw_strings(); + /* * Some simple up-front checks to see if we're able to query the * policy for basic state. We want the rule count to be 0 before |