d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move mac_bsdextended check up before running the test_libugidfw_strings testcases

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-12-23 09:59:31 +00:00
parent 194b8d633f
commit ad25988f4c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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,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