Merge pull request #3402 from sigiesec/revert-64-bit-assertions

Revert 64 bit assertions

Makefile.am

@@ -456,7 +456,7 @@ test_apps = \
 	tests/test_mock_pub_sub \
 	tests/test_socket_null
 
-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -DUNITY_SUPPORT_64
+UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT
 UNITY_LIBS = $(top_builddir)/external/unity/libunity.a
 noinst_LIBRARIES = external/unity/libunity.a
 external_unity_libunity_a_SOURCES = external/unity/unity.c \

tests/CMakeLists.txt

@@ -164,7 +164,7 @@ add_library(unity STATIC
   "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity_internals.h")
 set_target_properties(unity PROPERTIES
   PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.h")
-target_compile_definitions(unity PUBLIC "UNITY_USE_COMMAND_LINE_ARGS" "UNITY_EXCLUDE_FLOAT" "UNITY_SUPPORT_64")
+target_compile_definitions(unity PUBLIC "UNITY_USE_COMMAND_LINE_ARGS" "UNITY_EXCLUDE_FLOAT")
 target_include_directories(unity PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../external/unity")
 
 if(MSVC_VERSION LESS 1700)

tests/test_monitor.cpp

@@ -171,7 +171,7 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
         event = get_monitor_event_v2 (client_mon, NULL, &client_local_address,
                                       &client_remote_address);
     }
-    TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CONNECTED, event);
+    TEST_ASSERT_EQUAL (ZMQ_EVENT_CONNECTED, event);
     TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address);
     TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address,
                                   strlen (expected_prefix_));
@@ -192,11 +192,11 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
     event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
     //  Sometimes the server sees the client closing before it gets closed.
     if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CLOSED, event);
+        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
         event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
     }
     if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_MONITOR_STOPPED, event);
+        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
     }
     free (client_local_address);
     free (client_remote_address);