Use the wapp.h header in tests

build.ps1

@@ -11,7 +11,7 @@ $Kernel = (Get-ChildItem Env:OS).Value
 $Machine = (Get-ChildItem Env:PROCESSOR_ARCHITECTURE).Value
 $Platform = "${Kernel}_${Machine}"
 
-$IncludeDirs = Get-ChildItem -Path src -Recurse -Directory -ErrorAction SilentlyContinue -Force | %{$("/I " + '"' + $_.FullName + '"')}
+$IncludeDirs = "/I src"
 $SrcFiles = "src/wapp.c"
 
 $TestIncludeDirs = Get-ChildItem -Path tests -Recurse -Directory -ErrorAction SilentlyContinue -Force | %{$("/I " + '"' + $_.FullName + '"')}

compile

@@ -61,7 +61,7 @@ case $COMPONENTS in
     ;;
 esac
 
-TEST_INCLUDE="$(find src -type d | xargs -I{} echo -n "-I{} ") $(find tests -type d | xargs -I{} echo -n "-I{} ")"
+TEST_INCLUDE="-Isrc $(find tests -type d | xargs -I{} echo -n "-I{} ")"
 TEST_SRC="$(find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")"
 
 BUILD_DIR="libwapp-build/$PLATFORM-$BUILD_TYPE"

tests/allocator/test_allocator.c

@@ -1,7 +1,5 @@
 #include "test_allocator.h"
-#include "mem_allocator.h"
-#include "mem_arena_allocator.h"
-#include "tester.h"
+#include "wapp.h"
 #include <stdbool.h>
 #include <stdlib.h>
 

tests/allocator/test_allocator.h

@@ -1,7 +1,7 @@
 #ifndef TEST_ALLOCATOR_H
 #define TEST_ALLOCATOR_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/arena/test_arena.c

@@ -1,8 +1,5 @@
 #include "test_arena.h"
-#include "aliases.h"
-#include "mem_arena.h"
-#include "misc_utils.h"
-#include "tester.h"
+#include "wapp.h"
 #include <stdbool.h>
 #include <stdlib.h>
 

tests/arena/test_arena.h

@@ -1,7 +1,7 @@
 #ifndef TEST_ARENA_H
 #define TEST_ARENA_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/cpath/test_cpath.c

@@ -1,10 +1,5 @@
 #include "test_cpath.h"
-#include "cpath.h"
-#include "mem_allocator.h"
-#include "mem_arena_allocator.h"
-#include "misc_utils.h"
-#include "str8.h"
-#include "tester.h"
+#include "wapp.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdbool.h>

tests/cpath/test_cpath.h

@@ -1,7 +1,7 @@
 #ifndef TEST_CPATH_H
 #define TEST_CPATH_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/shell_commander/test_shell_commander.c

@@ -1,7 +1,5 @@
 #include "test_shell_commander.h"
-#include "commander.h"
-#include "str8.h"
-#include "tester.h"
+#include "wapp.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

tests/shell_commander/test_shell_commander.h

@@ -1,7 +1,7 @@
 #ifndef TEST_SHELL_COMMANDER_H
 #define TEST_SHELL_COMMANDER_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/str8/test_str8.c

@@ -1,9 +1,5 @@
 #include "test_str8.h"
-#include "mem_allocator.h"
-#include "mem_arena_allocator.h"
-#include "misc_utils.h"
-#include "str8.h"
-#include "tester.h"
+#include "wapp.h"
 #include <stdbool.h>
 
 #define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0]))

tests/str8/test_str8.h

@@ -1,7 +1,7 @@
 #ifndef TEST_STR8_H
 #define TEST_STR8_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/str8/test_str8_list.c

@@ -1,6 +1,5 @@
 #include "test_str8_list.h"
-#include "str8.h"
-#include "tester.h"
+#include "wapp.h"
 
 TestFuncResult test_str8_list_get(void) {
   bool result;

tests/str8/test_str8_list.h

@@ -1,7 +1,7 @@
 #ifndef TEST_STR8_LIST_H
 #define TEST_STR8_LIST_H
 
-#include "tester.h"
+#include "wapp.h"
 
 #ifdef __cplusplus
 BEGIN_C_LINKAGE

tests/wapptest.c

@@ -4,7 +4,7 @@
 #include "test_arena.h"
 #include "test_cpath.h"
 #include "test_shell_commander.h"
-#include "tester.h"
+#include "wapp.h"
 #include <stdlib.h>
 
 int main(void) {