Merge pull request #229 from ACRIOS-Systems/bugfix/fix_linux_tests

MichalPrincNXP · web-flow · commit 8fb915ec6b78 · 2022-01-20T19:01:17.000+01:00
Fixed making test under Linux
diff --git a/erpc_c/port/erpc_config_internal.h b/erpc_c/port/erpc_config_internal.h
@@ -70,15 +70,12 @@
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
 #if !defined(ERPC_CODEC_COUNT)
 #define ERPC_CODEC_COUNT (2U)
-#warning "ERPC_CODEC_COUNT is not defined. Default is used."
 #endif
 #if !defined(ERPC_MESSAGE_LOGGERS_COUNT)
 #define ERPC_MESSAGE_LOGGERS_COUNT (0U)
-#warning "ERPC_MESSAGE_LOGGERS_COUNT is not defined. Default is used."
 #endif
 #if !defined(ERPC_CLIENTS_THREADS_AMOUNT)
 #define ERPC_CLIENTS_THREADS_AMOUNT (1U)
-#warning "ERPC_CLIENTS_THREADS_AMOUNT is not defined. Default is used."
 #endif
 #endif
 
diff --git a/erpcgen/src/templates/c_server_header.template b/erpcgen/src/templates/c_server_header.template
@@ -51,7 +51,7 @@ typedef void * erpc_service_t;
 erpc_service_t create_{$iface.serviceClassName}(void);
 
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-void destroy_{$iface.serviceClassName}(erpc_service_t *service);
+void destroy_{$iface.serviceClassName}(erpc_service_t service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
 void destroy_{$iface.serviceClassName}(void);
 #else
diff --git a/erpcgen/src/templates/c_server_source.template b/erpcgen/src/templates/c_server_source.template
@@ -250,11 +250,11 @@ erpc_service_t create_{$iface.serviceClassName}()
     return new (nothrow) {$iface.serviceClassName}();
 }
 
-void destroy_{$iface.serviceClassName}(erpc_service_t *service)
+void destroy_{$iface.serviceClassName}(erpc_service_t service)
 {
-    if (*service)
+    if (service)
     {
-        delete service;
+        delete ({$iface.serviceClassName} *)service;
     }
 }
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
diff --git a/erpcgen/test/test_dynamic_ann_c.yml b/erpcgen/test/test_dynamic_ann_c.yml
diff --git a/erpcgen/test/test_service_c.yml b/erpcgen/test/test_service_c.yml
@@ -0,0 +1,48 @@
+---
+name: static
+desc: dynamic annotation is not used.
+idl: |
+    program test
+
+    interface ErrorTest{
+        oneway f()
+    }
+
+test_server.h:
+    - erpc_service_t create_ErrorTest_service(void);
+
+    - "#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC"
+    - void destroy_ErrorTest_service(erpc_service_t service);
+    - "#elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC"
+    - void destroy_ErrorTest_service(void);
+    - "#else"
+    - "#warning \"Unknown eRPC allocation policy!\""
+    - "#endif"
+
+test_server.cpp:
+    - ERPC_MANUALLY_CONSTRUCTED_STATIC(ErrorTest_service, s_ErrorTest_service);
+    - "#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC"
+    - erpc_service_t create_ErrorTest_service()
+    - "{"
+    - return new (nothrow) ErrorTest_service();
+    - "}"
+    - void destroy_ErrorTest_service(erpc_service_t service)
+    - "{"
+    - if (service)
+    - "{"
+    - delete (ErrorTest_service *)service;
+    - "}"
+    - "}"
+    - "#elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC"
+    - erpc_service_t create_ErrorTest_service()
+    - "{"
+    - s_ErrorTest_service.construct();
+    - return s_ErrorTest_service.get();
+    - "}"
+    - void destroy_ErrorTest_service()
+    - "{"
+    - s_ErrorTest_service.destroy();
+    - "}"
+    - "#else"
+    - "#warning \"Unknown eRPC allocation policy!\""
+    - "#endif"
diff --git a/test/common/config/erpc_config.h b/test/common/config/erpc_config.h
@@ -146,7 +146,7 @@
 //! ERPC_MESSAGE_LOGGING_DISABLED.
 //!
 //! Uncomment for using logging feature.
-#define ERPC_MESSAGE_LOGGING (ERPC_MESSAGE_LOGGING_ENABLED)
+// #define ERPC_MESSAGE_LOGGING (ERPC_MESSAGE_LOGGING_ENABLED)
 
 //! @def ERPC_TRANSPORT_MU_USE_MCMGR
 //!
diff --git a/test/test_arbitrator/config/erpc_config.h b/test/test_arbitrator/config/erpc_config.h
@@ -145,7 +145,7 @@
 //! ERPC_MESSAGE_LOGGING_DISABLED.
 //!
 //! Uncomment for using logging feature.
-#define ERPC_MESSAGE_LOGGING (ERPC_MESSAGE_LOGGING_ENABLED)
+// #define ERPC_MESSAGE_LOGGING (ERPC_MESSAGE_LOGGING_ENABLED)
 
 //! @def ERPC_TRANSPORT_MU_USE_MCMGR
 //!
diff --git a/test/test_arrays/test_arrays_server_impl.cpp b/test/test_arrays/test_arrays_server_impl.cpp
@@ -417,7 +417,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_PointersService_service((erpc_service_t *)service_test);
+    destroy_PointersService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_PointersService_service();
 #endif
@@ -427,7 +427,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_binary/test_binary_server_impl.cpp b/test/test_binary/test_binary_server_impl.cpp
@@ -117,7 +117,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Binary_service((erpc_service_t *)service_test);
+    destroy_Binary_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Binary_service();
 #endif
@@ -127,7 +127,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_builtin/test_builtin_server_impl.cpp b/test/test_builtin/test_builtin_server_impl.cpp
@@ -193,7 +193,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_BuiltinServices_service((erpc_service_t *)service_test);
+    destroy_BuiltinServices_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_BuiltinServices_service();
 #endif
@@ -203,7 +203,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_callbacks/test_callbacks_server_impl.cpp b/test/test_callbacks/test_callbacks_server_impl.cpp
@@ -126,7 +126,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_ClientCore0Services_service((erpc_service_t *)service_test);
+    destroy_ClientCore0Services_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_ClientCore0Services_service();
 #endif
@@ -136,7 +136,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_const/test_const_server_impl.cpp b/test/test_const/test_const_server_impl.cpp
@@ -58,7 +58,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_enums/test_enums_server_impl.cpp b/test/test_enums/test_enums_server_impl.cpp
@@ -118,7 +118,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_EnumsService_service((erpc_service_t *)service_test);
+    destroy_EnumsService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_EnumsService_service();
 #endif
@@ -128,7 +128,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_lists/test_lists_server_impl.cpp b/test/test_lists/test_lists_server_impl.cpp
@@ -352,7 +352,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_PointersService_service((erpc_service_t *)service_test);
+    destroy_PointersService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_PointersService_service();
 #endif
@@ -362,7 +362,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_shared/test_shared_server_impl.cpp b/test/test_shared/test_shared_server_impl.cpp
@@ -72,7 +72,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_SharedService_service((erpc_service_t *)service_test);
+    destroy_SharedService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_SharedService_service();
 #endif
@@ -82,7 +82,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_struct/test_struct_server_impl.cpp b/test/test_struct/test_struct_server_impl.cpp
@@ -230,8 +230,8 @@ void remove_services_from_server()
     erpc_remove_service_from_server(service1);
     erpc_remove_service_from_server(service2);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_ArithmeticService1_service((erpc_service_t *)service1);
-    destroy_ArithmeticService2_service((erpc_service_t *)service2);
+    destroy_ArithmeticService1_service(service1);
+    destroy_ArithmeticService2_service(service2);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_ArithmeticService1_service();
     destroy_ArithmeticService2_service();
@@ -242,7 +242,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_typedef/test_typedef_server_impl.cpp b/test/test_typedef/test_typedef_server_impl.cpp
@@ -172,7 +172,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_TypedefService_service((erpc_service_t *)service_test);
+    destroy_TypedefService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_TypedefService_service();
 #endif
@@ -182,7 +182,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif
diff --git a/test/test_unions/test_unions_server_impl.cpp b/test/test_unions/test_unions_server_impl.cpp
@@ -250,7 +250,7 @@ void remove_services_from_server()
 {
     erpc_remove_service_from_server(service_test);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_ArithmeticService_service((erpc_service_t *)service_test);
+    destroy_ArithmeticService_service(service_test);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_ArithmeticService_service();
 #endif
@@ -260,7 +260,7 @@ void remove_common_services_from_server(erpc_service_t service)
 {
     erpc_remove_service_from_server(service);
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
-    destroy_Common_service((erpc_service_t *)service);
+    destroy_Common_service(service);
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     destroy_Common_service();
 #endif

Original file line number	Diff line number	Diff line change
`@@ -250,11 +250,11 @@ erpc_service_t create_{$iface.serviceClassName}()`
`250`	`250`	`return new (nothrow) {$iface.serviceClassName}();`
`251`	`251`	`}`
`252`	`252`
`253`		`-void destroy_{$iface.serviceClassName}(erpc_service_t *service)`
	`253`	`+void destroy_{$iface.serviceClassName}(erpc_service_t service)`
`254`	`254`	`{`
`255`		`- if (*service)`
	`255`	`+ if (service)`
`256`	`256`	`{`
`257`		`- delete service;`
	`257`	`+ delete ({$iface.serviceClassName} *)service;`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`#elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC`