Last-Update: 2018-10-03
Forwarded: not-needed
Bug-Upstream: https://support.zabbix.com/browse/ZBX-14941
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: fixes FTBFS
~~~~
 configure.ac:1718: error: required file 'tests/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxcommon/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxconf/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxdbcache/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxdbhigh/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxhistory/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxjson/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxsysinfo/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxsysinfo/linux/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxsysinfo/common/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxcommshigh/Makefile.in' not found
 configure.ac:1718: error: required file 'tests/libs/zbxalgo/Makefile.in' not found
 autoreconf: automake failed with exit status: 1
~~~~

--- a/configure.ac
+++ b/configure.ac
@@ -1395,9 +1395,8 @@
 AM_CONDITIONAL(IPV6, test "x$ipv6" = "xyes")
 
 AM_CONDITIONAL([DBSCHEMA], [test -d create])
 
-AM_CONDITIONAL([ZBXCMOCKA], [(test -f m4/conf_tests.m4) && (test "x$server" = "xyes" || test "x$proxy" = "xyes" || test "x$agent" = "xyes")])
 
 have_db="no"
 have_unixodbc="no"
 have_web_monitoring="no"
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,60 +134,4 @@
 	cp sass/favicon.ico ui/
 
 css: css_theme_blue css_theme_dark css_hc_light css_hc_dark css_icons
 
-## cmocka test support
-if ZBXCMOCKA
-WRAP_DB_FUNCS = \
-	-Wl,--wrap=zbx_db_vselect \
-	-Wl,--wrap=zbx_db_select_n \
-	-Wl,--wrap=zbx_db_fetch \
-	-Wl,--wrap=__zbx_DBexecute \
-	-Wl,--wrap=DBbegin \
-	-Wl,--wrap=DBcommit \
-	-Wl,--wrap=DBexecute_multiple_query \
-	-Wl,--wrap=DBfree_result
-
-WRAP_IO_FUNCS = \
-	-Wl,--wrap=fopen \
-	-Wl,--wrap=fclose \
-	-Wl,--wrap=fgets \
-	-Wl,--wrap=open
-
-WRAP_FS_FUNCS = \
-	-Wl,--wrap=opendir \
-	-Wl,--wrap=readdir \
-	-Wl,--wrap=__xstat \
-	-Wl,--wrap=__fxstat \
-	-Wl,--wrap=stat
-
-WRAP_EXIT = \
-	-Wl,--wrap=exit
-
-WRAP_COMM_FUNCS = \
-	-Wl,--wrap=read \
-	-Wl,--wrap=connect
-
-WRAP_LOG = \
-	-Wl,--wrap=__zbx_zabbix_log
-
-COMMON_WRAP_FUNCS = \
-	$(WRAP_DB_FUNCS) \
-	$(WRAP_IO_FUNCS) \
-	$(WRAP_FS_FUNCS) \
-	$(WRAP_EXIT) \
-	$(WRAP_COMM_FUNCS) \
-	$(WRAP_LOG)
-
-tests_build:
-	$(MAKE) $(AM_MAKEFLAGS) && \
-	cd tests && \
-	$(MAKE) $(AM_MAKEFLAGS) LDFLAGS="$(LDFLAGS) $(COMMON_WRAP_FUNCS)" LIBS="$(LIBS) -lcmocka -lyaml"
-
-tests: tests_build
-	tests/tests_run.pl
-
-clean: clean-recursive
-	cd tests && $(MAKE) clean
-endif
-
-.PHONY: test tests clean