jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MFC r292650,r292651:

Browse Source 
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
This commit is contained in:
Enji Cooper 2016-01-06 20:06:15 +00:00
parent 186150414e
commit 85f67504f3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=293257
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/sys/mac/bsdextended/ugidfw_test.c
View File

@ -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