fix test dependencies

facil-io · Jul 28, 2024 · 0e473ed · 0e473ed
1 parent a281d72
commit 0e473ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/fio-stl.h b/fio-stl.h
@@ -2176,7 +2176,6 @@ Everything Inclusion
 #define FIO_CRYPT
 #define FIO_SIGNAL
 #define FIO_SOCK
-#define FIO_STATE
 #define FIO_THREADS
 
 #else
@@ -2261,18 +2260,20 @@ Core Inclusion
 #undef FIO_LOG
 #undef FIO_MATH
 #undef FIO_RAND
+#undef FIO_STATE
 #undef FIO_TIME
 #undef FIO_URL
+#undef FIO_CORE
 #define FIO_ATOL
 #define FIO_ATOMIC
 #define FIO_FILES
 #define FIO_GLOB_MATCH
 #define FIO_LOG
 #define FIO_MATH
 #define FIO_RAND
+#define FIO_STATE
 #define FIO_TIME
 #define FIO_URL
-#undef FIO_CORE
 #endif
 
 /* *****************************************************************************

diff --git a/fio-stl/000 dependencies.h b/fio-stl/000 dependencies.h
@@ -67,7 +67,6 @@ Everything Inclusion
 #define FIO_CRYPT
 #define FIO_SIGNAL
 #define FIO_SOCK
-#define FIO_STATE
 #define FIO_THREADS
 
 #else
@@ -152,18 +151,20 @@ Core Inclusion
 #undef FIO_LOG
 #undef FIO_MATH
 #undef FIO_RAND
+#undef FIO_STATE
 #undef FIO_TIME
 #undef FIO_URL
+#undef FIO_CORE
 #define FIO_ATOL
 #define FIO_ATOMIC
 #define FIO_FILES
 #define FIO_GLOB_MATCH
 #define FIO_LOG
 #define FIO_MATH
 #define FIO_RAND
+#define FIO_STATE
 #define FIO_TIME
 #define FIO_URL
-#undef FIO_CORE
 #endif
 
 /* *****************************************************************************

diff --git a/tests/malloc.c b/tests/malloc.c
@@ -1,3 +1,7 @@
+#define FIO_CORE
+#define FIO_CLI
+#define FIO_THREADS
+#include <fio-stl.h>
 /* use the fast-setup global allocator shortcut for FIO_MEMORY_NAME */
 #define FIO_MEMORY_INITIALIZE_ALLOCATIONS 0
 #define FIO_MALLOC
@@ -8,15 +12,7 @@
  */
 #define FIO_MEMORY_ARENA_COUNT 2
 #endif
-
-#define FIO_LOG
-#define FIO_TIME
-#define FIO_ATOMIC
-#define FIO_THREADS
-#include <fio-stl.h>
-#define FIO_CLI
-#define FIO_MALLOC_TMP_USE_SYSTEM 1
-#include <fio-stl.h>
+#include FIO_INCLUDE_FILE
 
 #include <stdint.h>
 #include <stdio.h>