1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
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
@@ -1162,9 +1162,8 @@
AM_CONDITIONAL([DBSCHEMA], [test -d create])
AM_CONDITIONAL([ZBXCUNIT], [test -f src/libs/zbxcunit/zbxcunit.c])
-AM_CONDITIONAL([ZBXCMOCKA], [(test -d tests/) && (test "x$server" = "xyes" || test "x$agent" = "xyes")])
have_db="no"
have_unixodbc="no"
have_web_monitoring="no"
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,55 +104,5 @@
test:
cd $(TESTDIR) && $(MAKE) $(AM_MAKEFLAGS) test
-## 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
-
-WRAP_FS_FUNCS = \
- -Wl,--wrap=opendir \
- -Wl,--wrap=readdir \
- -Wl,--wrap=stat \
- -Wl,--wrap=__xstat
-
-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
-endif
-
.PHONY: test tests
|
