update for macos install and mem tests

Author: ed-silva-eb

CMakeLists.txt

@@ -227,7 +227,7 @@ endif()
 mark_as_advanced(ENV_PRESENT VALGRIND_PRESENT)
 find_program(ENV_PRESENT env)
 find_program(VALGRIND_PRESENT valgrind)
-find_program(ASCIIDOC_EXECUTABLE asciidoc)
+find_program(ASCIIDOC_EXECUTABLE NAMES asciidoc asciidoctor)
 find_program(SED_EXECUTABLE sed)
 find_program(GIT_EXECUTABLE git)
 

src/common/memusage.c

@@ -62,7 +62,7 @@
 #include "memusage.h"
 #include "bfind.h"
 
-#if defined(OS_LINUX) || defined(__FreeBSD__) || defined(OS_SOLARIS)
+#if defined(OS_LINUX) || defined(__FreeBSD__) || defined(OS_SOLARIS) || defined(OSCAP_TEST_READ_COMMON_SIZET)
 static int read_common_sizet(void *szp, char *strval)
 {
 	char *end;
@@ -88,6 +88,10 @@ static int read_common_sizet(void *szp, char *strval)
 	return (0);
 }
 
+#endif
+
+#if defined(OS_LINUX) || defined(__FreeBSD__) || defined(OS_SOLARIS)
+
 struct stat_parser {
 	char *keyword;
 	int (*storval)(void *, char *);

tests/API/probes/test_memusage.c

@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include "memusage.h"
+#define OSCAP_TEST_READ_COMMON_SIZET
 #include "memusage.c"
-#define OS_LINUX
 
 static int test_basic()
 {