fix tests

mas-bandwidth · Dec 24, 2023 · dafba88 · dafba88
1 parent d2ae572
commit dafba88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/premake5.lua b/premake5.lua
@@ -13,11 +13,11 @@ solution "reliable"
     floatingpoint "Fast"
     filter "configurations:Debug"
         symbols "On"
-        defines { "RELIABLE_DEBUG" }
+        defines { "RELIABLE_DEBUG", "RELIABLE_ENABLE_TESTS" }
     filter "configurations:Release"
         symbols "Off"
         optimize "Speed"
-        defines { "RELIABLE_RELEASE" }
+        defines { "RELIABLE_RELEASE", "RELIABLE_ENABLE_TESTS" }
 
 project "test"
     files { "test.cpp" }

diff --git a/reliable.c b/reliable.c
@@ -2258,7 +2258,7 @@ void test_sequence_buffer_rollover()
     reliable_endpoint_destroy( context.receiver );
 }
 
-#define RELIABLE_ARRAY_SIZE(x) ( int( sizeof((x)) / sizeof((x)[0]) ) )
+#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
 
 struct test_tracking_allocate_context_t
 {
@@ -2270,15 +2270,15 @@ void * test_tracking_allocate_function( void * context, uint64_t bytes )
     struct test_tracking_allocate_context_t* tracking_context = (struct test_tracking_allocate_context_t*)context;
     void * allocation = malloc( bytes );
     int tracking_index;
-    for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations); ++tracking_index )
+    for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations); ++tracking_index )
     {
         if ( tracking_context->active_allocations[tracking_index] == NULL )
         {
             break;
         }
     }
 
-    reliable_assert(tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations));
+    reliable_assert(tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations));
     tracking_context->active_allocations[tracking_index] = allocation;
     return allocation;
 }
@@ -2287,15 +2287,15 @@ void test_tracking_free_function( void * context, void * pointer )
 {
     struct test_tracking_allocate_context_t* tracking_context = (struct test_tracking_allocate_context_t*)context;
     int tracking_index;
-    for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations); ++tracking_index )
+    for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations); ++tracking_index )
     {
         if ( tracking_context->active_allocations[tracking_index] == pointer )
         {
             break;
         }
     }
 
-    reliable_assert(tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations));
+    reliable_assert( tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations) );
     tracking_context->active_allocations[tracking_index] = NULL;
     free( pointer );
 }
@@ -2355,10 +2355,10 @@ void test_fragment_cleanup()
     };
 
     // Make sure we're sending more than receiver_config.fragment_reassembly_buffer_size packets, so the buffer wraps around.
-    reliable_assert( RELIABLE_ARRAY_SIZE( packet_sizes ) > receiver_config.fragment_reassembly_buffer_size );
+    reliable_assert( (int) ARRAY_LENGTH( packet_sizes ) > receiver_config.fragment_reassembly_buffer_size );
 
     int i;
-    for ( i = 0; i < RELIABLE_ARRAY_SIZE( packet_sizes ); ++i )
+    for ( i = 0; i < (int) ARRAY_LENGTH( packet_sizes ); ++i )
     {
         // Only allow one packet per transmit, so that our fragmented packets are only partially
         // delivered.
@@ -2384,7 +2384,7 @@ void test_fragment_cleanup()
 
     // Make sure that there is no memory that hasn't been freed.
     int tracking_index;
-    for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_alloc_context.active_allocations); ++tracking_index )
+    for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_alloc_context.active_allocations); ++tracking_index )
     {
         check( tracking_alloc_context.active_allocations[tracking_index] == NULL );
     }