File tree Expand file tree Collapse file tree
tests/API/XCCDF/unittests Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -113,7 +113,7 @@ add_oscap_test("test_fix_resultid_by_suffix.sh")
113113add_oscap_test ("test_generate_fix_ansible_vars.sh" )
114114add_oscap_test ("test_xccdf_requires_conflicts.sh" )
115115add_oscap_test ("test_results_hostname.sh" )
116- add_oscap_test ("test_xccdf_result_sysinfo_platform.sh" LABELS macos )
116+ add_oscap_test ("test_xccdf_result_sysinfo_platform.sh" LABELS macos freebsd )
117117add_oscap_test ("test_skip_rule.sh" )
118118add_oscap_test ("test_no_newline_between_select_elements.sh" )
119119add_oscap_test ("test_single_line_tailoring.sh" )
Original file line number Diff line number Diff line change 1010
1111#include "xccdf_benchmark.h"
1212
13+ #if defined(OS_APPLE ) || defined(OS_FREEBSD )
14+ #define EXPECT_MAC_FACTS 1
15+ #endif
16+
1317int main (void )
1418{
1519 struct xccdf_result * result = xccdf_result_new ();
1620 struct xccdf_target_fact_iterator * facts = NULL ;
21+ #if defined(EXPECT_MAC_FACTS )
1722 bool saw_mac = false;
1823 bool saw_asset_mac = false;
24+ #endif
1925
2026 xccdf_result_fill_sysinfo (result );
2127 facts = xccdf_result_get_target_facts (result );
@@ -27,22 +33,24 @@ int main(void)
2733 if (name == NULL )
2834 continue ;
2935
36+ #if defined(EXPECT_MAC_FACTS )
3037 if (strcmp (name , "urn:xccdf:fact:ethernet:MAC" ) == 0 )
3138 saw_mac = true;
3239 if (strcmp (name , "urn:xccdf:fact:asset:identifier:mac" ) == 0 )
3340 saw_asset_mac = true;
41+ #endif
3442 }
3543
3644 xccdf_target_fact_iterator_free (facts );
3745 xccdf_result_free (result );
3846
39- #if defined(OS_APPLE )
47+ #if defined(EXPECT_MAC_FACTS )
4048 if (!saw_mac ) {
41- fprintf (stderr , "Expected at least one urn:xccdf:fact:ethernet:MAC fact on macOS .\n" );
49+ fprintf (stderr , "Expected at least one urn:xccdf:fact:ethernet:MAC fact on this platform .\n" );
4250 return 1 ;
4351 }
4452 if (!saw_asset_mac ) {
45- fprintf (stderr , "Expected at least one urn:xccdf:fact:asset:identifier:mac fact on macOS .\n" );
53+ fprintf (stderr , "Expected at least one urn:xccdf:fact:asset:identifier:mac fact on this platform .\n" );
4654 return 1 ;
4755 }
4856#endif
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ if [ -n "${CUSTOM_OSCAP+x}" ] ; then
77fi
88
99case " $( uname) " in
10- Darwin) ;;
10+ Darwin|FreeBSD ) ;;
1111 * ) exit 255 ;;
1212esac
1313
You can’t perform that action at this time.
0 commit comments