summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-12-23 09:59:31 +0000
committerngie <ngie@FreeBSD.org>2015-12-23 09:59:31 +0000
commite089052101e96d7fa6d3cd71572dbf86dd7888c1 (patch)
treeaa2ee7bef1e3e0e10a0d67e79caf4a51f1f38e3e
parent8061f8577d151919ee17f62f2b9004e64c566140 (diff)
downloadFreeBSD-src-e089052101e96d7fa6d3cd71572dbf86dd7888c1.zip
FreeBSD-src-e089052101e96d7fa6d3cd71572dbf86dd7888c1.tar.gz
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 MFC after: 3 days Sponsored by: EMC / Isilon Storage Division
-rw-r--r--tests/sys/mac/bsdextended/ugidfw_test.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/sys/mac/bsdextended/ugidfw_test.c b/tests/sys/mac/bsdextended/ugidfw_test.c
index 7c1dc2a..f8130aa 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,16 @@ 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();
+
/*
* 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
OpenPOWER on IntegriCloud