Improved test dependency scoping

boazsegev · boazsegev · commit f7748af45dc0 · 2025-12-09T22:18:31.000-06:00
diff --git a/fio-stl.h b/fio-stl.h
@@ -4339,6 +4339,11 @@ FIO_MAP Ordering & Naming Shortcut
 #define FIO_HTTP_HANDLE
 #endif
 
+#if (defined(DEBUG) && defined(FIO_HTTP_HANDLE))
+#undef FIO_IO
+#define FIO_IO
+#endif
+
 #if defined(FIO_HTTP)
 #undef FIO_PUBSUB
 #define FIO_PUBSUB
diff --git a/fio-stl/000 dependencies.h b/fio-stl/000 dependencies.h
@@ -278,6 +278,11 @@ FIO_MAP Ordering & Naming Shortcut
 #define FIO_HTTP_HANDLE
 #endif
 
+#if (defined(DEBUG) && defined(FIO_HTTP_HANDLE))
+#undef FIO_IO
+#define FIO_IO
+#endif
+
 #if defined(FIO_HTTP)
 #undef FIO_PUBSUB
 #define FIO_PUBSUB
diff --git a/tests/test-helpers.h b/tests/test-helpers.h
@@ -1,7 +1,6 @@
 #ifndef H___TEST_HELPERS___H
 #define H___TEST_HELPERS___H
 
-#define FIO_TEST_ALL
 #define FIO_CORE
 #include "../fio-stl/include.h"
 
diff --git a/tests/z-dynamic-types.c b/tests/z-dynamic-types.c
@@ -1,6 +1,7 @@
 /* *****************************************************************************
 Test
 ***************************************************************************** */
+#define FIO_TEST_ALL
 #include "test-helpers.h"
 
 /* *****************************************************************************
