.......... [DEV-2176] added various fixes

27 files changed, 94 insertions, 96 deletions

diff --git a/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am
index a6ab079258a..4733cf0140e 100644
--- a/tests/libs/zbxsysinfo/linux/Makefile.am
+++ b/tests/libs/zbxsysinfo/linux/Makefile.am
@@ -1,16 +1,16 @@
 if AGENT
 AGENT_tests = \
-	NET_IF_DISCOVERY \
-	VFS_FS_DISCOVERY \
-	KERNEL_MAXPROC \
-	SYSTEM_CPU_SWITCHES \
-	KERNEL_MAXFILES \
-	SYSTEM_CPU_INTR \
-	SYSTEM_BOOTTIME \
-	NET_IF_TOTAL \
-	NET_IF_IN \
-	NET_IF_OUT \
-	SYSTEM_HW_CHASSIS
+	net_if_discovery \
+	vfs_fs_discovery \
+	kernel_maxproc \
+	system_cpu_switches \
+	kernel_maxfiles \
+	system_cpu_intr \
+	system_boottime \
+	net_if_total \
+	net_if_in \
+	net_if_out \
+	system_hw_chassis
 endif
 
 noinst_PROGRAMS = $(AGENT_tests)
@@ -65,136 +65,136 @@ COMMON_LIB_FILES = \
 
 COMMON_COMPILER_FLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests
 
-NET_IF_DISCOVERY_SOURCES = \
-	NET_IF_DISCOVERY.c \
+net_if_discovery_SOURCES = \
+	net_if_discovery.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_DISCOVERY_LDADD = \
+net_if_discovery_LDADD = \
 	$(COMMON_LIB_FILES)
 
-NET_IF_DISCOVERY_LDADD += @AGENT_LIBS@
+net_if_discovery_LDADD += @AGENT_LIBS@
 
-NET_IF_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@
+net_if_discovery_LDFLAGS = @AGENT_LDFLAGS@
 
-NET_IF_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_discovery_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-VFS_FS_DISCOVERY_SOURCES = \
-	VFS_FS_DISCOVERY.c \
+vfs_fs_discovery_SOURCES = \
+	vfs_fs_discovery.c \
 	$(COMMON_SRC_FILES)
 
-VFS_FS_DISCOVERY_LDADD = \
+vfs_fs_discovery_LDADD = \
 	$(COMMON_LIB_FILES)
 
-VFS_FS_DISCOVERY_LDADD += @AGENT_LIBS@
+vfs_fs_discovery_LDADD += @AGENT_LIBS@
 
-VFS_FS_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@
+vfs_fs_discovery_LDFLAGS = @AGENT_LDFLAGS@
 
-VFS_FS_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS)
+vfs_fs_discovery_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-KERNEL_MAXPROC_SOURCES = \
-	KERNEL_COMMON.c \
-	KERNEL_MAXPROC.c \
+kernel_maxproc_SOURCES = \
+	kernel_common.c \
+	kernel_maxproc.c \
 	$(COMMON_SRC_FILES)
 
-KERNEL_MAXPROC_LDADD = \
+kernel_maxproc_LDADD = \
 	$(COMMON_LIB_FILES)
 
-KERNEL_MAXPROC_LDADD += @AGENT_LIBS@
+kernel_maxproc_LDADD += @AGENT_LIBS@
 
-KERNEL_MAXPROC_LDFLAGS = @AGENT_LDFLAGS@
+kernel_maxproc_LDFLAGS = @AGENT_LDFLAGS@
 
-KERNEL_MAXPROC_CFLAGS = $(COMMON_COMPILER_FLAGS)
+kernel_maxproc_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_CPU_SWITCHES_SOURCES = \
-	SYSTEM_CPU_SWITCHES.c \
+system_cpu_switches_SOURCES = \
+	system_cpu_switches.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_CPU_SWITCHES_LDADD = \
+system_cpu_switches_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_CPU_SWITCHES_LDADD += @AGENT_LIBS@
+system_cpu_switches_LDADD += @AGENT_LIBS@
 
-SYSTEM_CPU_SWITCHES_LDFLAGS = @AGENT_LDFLAGS@
+system_cpu_switches_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_CPU_SWITCHES_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_cpu_switches_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-KERNEL_MAXFILES_SOURCES = \
-	KERNEL_COMMON.c \
-	KERNEL_MAXFILES.c \
+kernel_maxfiles_SOURCES = \
+	kernel_common.c \
+	kernel_maxfiles.c \
 	$(COMMON_SRC_FILES)
 
-KERNEL_MAXFILES_LDADD = \
+kernel_maxfiles_LDADD = \
 	$(COMMON_LIB_FILES)
 
-KERNEL_MAXFILES_LDADD += @AGENT_LIBS@
+kernel_maxfiles_LDADD += @AGENT_LIBS@
 
-KERNEL_MAXFILES_LDFLAGS = @AGENT_LDFLAGS@
+kernel_maxfiles_LDFLAGS = @AGENT_LDFLAGS@
 
-KERNEL_MAXFILES_CFLAGS = $(COMMON_COMPILER_FLAGS)
+kernel_maxfiles_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_CPU_INTR_SOURCES = \
-	SYSTEM_CPU_INTR.c \
+system_cpu_intr_SOURCES = \
+	system_cpu_intr.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_CPU_INTR_LDADD = \
+system_cpu_intr_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_CPU_INTR_LDADD += @AGENT_LIBS@
+system_cpu_intr_LDADD += @AGENT_LIBS@
 
-SYSTEM_CPU_INTR_LDFLAGS = @AGENT_LDFLAGS@
+system_cpu_intr_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_CPU_INTR_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_cpu_intr_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_BOOTTIME_SOURCES = \
-	SYSTEM_BOOTTIME.c \
+system_boottime_SOURCES = \
+	system_boottime.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_BOOTTIME_LDADD = \
+system_boottime_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_BOOTTIME_LDADD += @AGENT_LIBS@
+system_boottime_LDADD += @AGENT_LIBS@
 
-SYSTEM_BOOTTIME_LDFLAGS = @AGENT_LDFLAGS@
+system_boottime_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_BOOTTIME_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_boottime_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_TOTAL
-NET_IF_TOTAL_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_TOTAL.c \
+#net_if_total
+net_if_total_SOURCES = \
+	net_if_common.c \
+	net_if_total.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_TOTAL_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_total_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_TOTAL_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_total_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_IN
-NET_IF_IN_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_IN.c \
+#net_if_in
+net_if_in_SOURCES = \
+	net_if_common.c \
+	net_if_in.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_IN_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_in_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_IN_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_in_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_OUT
-NET_IF_OUT_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_OUT.c \
+#net_if_out
+net_if_out_SOURCES = \
+	net_if_common.c \
+	net_if_out.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_OUT_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_out_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_OUT_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_out_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#SYSTEM_HW_CHASSIS
-SYSTEM_HW_CHASSIS_SOURCES = \
-	SYSTEM_HW_CHASSIS.c \
+#system_hw_chassis
+system_hw_chassis_SOURCES = \
+	system_hw_chassis.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_HW_CHASSIS_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+system_hw_chassis_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-SYSTEM_HW_CHASSIS_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_hw_chassis_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
 endif
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c b/tests/libs/zbxsysinfo/linux/kernel_common.c
index caebe2e19d7..f2697131e28 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_common.c
@@ -17,14 +17,14 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
 #include "zbxnum.h"
 
-void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func)
+void	zbx_mock_test_entry_kernel_common(void **state, int kernel_func)
 {
 	AGENT_REQUEST		request;
 	AGENT_RESULT		param_result;
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h b/tests/libs/zbxsysinfo/linux/kernel_common.h
index f84a843f13c..8dca45ef591 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/kernel_common.h
@@ -23,5 +23,5 @@
 #define ZABBIX_MOCK_KERNEL_MAXPROC	0
 #define ZABBIX_MOCK_KERNEL_MAXFILES	1
 
-void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func);
+void	zbx_mock_test_entry_kernel_common(void **state, int kernel_func);
 #endif
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.c
index 16649268eab..3656e2c6dd6 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXFILES);
+	zbx_mock_test_entry_kernel_common(state, ZABBIX_MOCK_KERNEL_MAXFILES);
 }
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.yaml b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.yaml
index b0d6628c6eb..b0d6628c6eb 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.yaml
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.yaml
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c b/tests/libs/zbxsysinfo/linux/kernel_maxproc.c
index eb99ce00492..45befd25946 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxproc.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXPROC);
+	zbx_mock_test_entry_kernel_common(state, ZABBIX_MOCK_KERNEL_MAXPROC);
 }
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml b/tests/libs/zbxsysinfo/linux/kernel_maxproc.yaml
index c1209712752..c1209712752 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxproc.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c b/tests/libs/zbxsysinfo/linux/net_if_common.c
index bfeb60728f2..be257c36870 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_common.c
@@ -17,14 +17,14 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
 #include "zbxnum.h"
 
-void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func)
+void	zbx_mock_test_entry_net_if_common(void **state, int net_if_func)
 {
 	AGENT_REQUEST		request;
 	AGENT_RESULT 		param_result;
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h b/tests/libs/zbxsysinfo/linux/net_if_common.h
index ba3856fb52c..76c7677cd9f 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/net_if_common.h
@@ -24,5 +24,5 @@
 #define ZABBIX_MOCK_NET_IF_OUT		1
 #define ZABBIX_MOCK_NET_IF_TOTAL	2
 
-void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func);
+void	zbx_mock_test_entry_net_if_common(void **state, int net_if_func);
 #endif
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/net_if_discovery.c
index 0c808b7312c..0c808b7312c 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_discovery.c
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml b/tests/libs/zbxsysinfo/linux/net_if_discovery.yaml
index 75493fdaa9d..75493fdaa9d 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_discovery.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c b/tests/libs/zbxsysinfo/linux/net_if_in.c
index d16c2714599..c2105d4dc2a 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_in.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_IN);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_net_if_in);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_IN.yaml b/tests/libs/zbxsysinfo/linux/net_if_in.yaml
index 564da0c2b1e..564da0c2b1e 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_IN.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_in.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c b/tests/libs/zbxsysinfo/linux/net_if_out.c
index 99e3f99c71d..1b13863cc91 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_out.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_OUT);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_net_if_out);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.yaml b/tests/libs/zbxsysinfo/linux/net_if_out.yaml
index a1424763ced..a1424763ced 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_out.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c b/tests/libs/zbxsysinfo/linux/net_if_total.c
index fe153997d6b..276dbb28484 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_total.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_TOTAL);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_net_if_total);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.yaml b/tests/libs/zbxsysinfo/linux/net_if_total.yaml
index 327b827fa2b..327b827fa2b 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_total.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c b/tests/libs/zbxsysinfo/linux/system_boottime.c
index 353d7071e39..353d7071e39 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c
+++ b/tests/libs/zbxsysinfo/linux/system_boottime.c
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml b/tests/libs/zbxsysinfo/linux/system_boottime.yaml
index 0d6747e45fc..0d6747e45fc 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_boottime.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c b/tests/libs/zbxsysinfo/linux/system_cpu_intr.c
index 412fa4e0292..a7727a59827 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_intr.c
@@ -3,7 +3,6 @@
 #include "zbxmockhelper.h"
 #include "zbxmockutil.h"
 
-#include "zbxcommon.h"
 #include "module.h"
 #include "zbxsysinfo.h"
 
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml b/tests/libs/zbxsysinfo/linux/system_cpu_intr.yaml
index 05925c16cb5..05925c16cb5 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_intr.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c b/tests/libs/zbxsysinfo/linux/system_cpu_switches.c
index 32d56eab025..32d56eab025 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_switches.c
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml b/tests/libs/zbxsysinfo/linux/system_cpu_switches.yaml
index e486911909e..e486911909e 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_switches.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c b/tests/libs/zbxsysinfo/linux/system_hw_chassis.c
index 8f9a4fc98e6..611dce8430a 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c
+++ b/tests/libs/zbxsysinfo/linux/system_hw_chassis.c
@@ -22,7 +22,6 @@
 #include "zbxmockutil.h"
 #include "zbxmockhelper.h"
 
-#include "zbxcommon.h"
 #include "zbxsysinfo.h"
 
 void	zbx_mock_test_entry(void **state)
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.yaml b/tests/libs/zbxsysinfo/linux/system_hw_chassis.yaml
index 9ca6b795fcd..9ca6b795fcd 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_hw_chassis.yaml
diff --git a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.c
index f76014892dc..f76014892dc 100644
--- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c
+++ b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.c
diff --git a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.yaml
index 0d4d9c88de5..0d4d9c88de5 100644
--- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml
+++ b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.yaml