diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-07 18:39:56 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-07 18:39:56 +0300 |
| commit | d3d1b6340db4bd59900ef61db90f5cc927dcd59b (patch) | |
| tree | 2710aea0bb61e17af0b994b86a1656a04dc77ba0 /tests | |
| parent | 27d4e37650a3cd785ffc481dcb5c831c7b58f9e1 (diff) | |
| parent | 6ef36762644b5d57dc2c96b4aa8392bc7af561f5 (diff) | |
.......... [ZBXNEXT-6451,ZBXNEXT-6455] updated to the latest master; fixed conflicts in:
- create/src/schema.tmpl
- include/db.h
- include/zbxhistory.h
- src/libs/zbxdbupgrade/dbupgrade_5030.c
- src/libs/zbxhistory/history.c
- ui/include/defines.inc.php
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libs/zbxdbcache/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/libs/zbxhistory/Makefile.am | 3 | ||||
| -rwxr-xr-x | tests/libs/zbxserver/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/mocks/valuecache/valuecache_mock.c | 11 |
4 files changed, 18 insertions, 0 deletions
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am index 42ec3ded75b..df2e13eb9d5 100644 --- a/tests/libs/zbxdbcache/Makefile.am +++ b/tests/libs/zbxdbcache/Makefile.am @@ -82,6 +82,8 @@ COMMON_WRAP_FUNCS = \ -Wl,--wrap=zbx_history_add_values \ -Wl,--wrap=zbx_history_sql_init \ -Wl,--wrap=zbx_history_elastic_init \ + -Wl,--wrap=zbx_elastic_version_extract \ + -Wl,--wrap=zbx_elastic_version_get \ -Wl,--wrap=time zbx_vc_get_values_SOURCES = \ diff --git a/tests/libs/zbxhistory/Makefile.am b/tests/libs/zbxhistory/Makefile.am index 6f8f5eacfee..c28a45c55e9 100644 --- a/tests/libs/zbxhistory/Makefile.am +++ b/tests/libs/zbxhistory/Makefile.am @@ -22,6 +22,9 @@ HISTORY_LIBS = \ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \ $(top_srcdir)/src/libs/zbxdb/libzbxdb.a \ + $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ + $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ + $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/tests/libzbxmockdata.a zbx_history_get_values_SOURCES = \ diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am index b4c9a175ce1..17ac0c03494 100755 --- a/tests/libs/zbxserver/Makefile.am +++ b/tests/libs/zbxserver/Makefile.am @@ -139,6 +139,8 @@ VALUECACHE_WRAP_FUNCS = \ -Wl,--wrap=zbx_history_add_values \ -Wl,--wrap=zbx_history_sql_init \ -Wl,--wrap=zbx_history_elastic_init \ + -Wl,--wrap=zbx_elastic_version_extract \ + -Wl,--wrap=zbx_elastic_version_get \ -Wl,--wrap=time \ -Wl,--wrap=substitute_simple_macros \ -Wl,--wrap=DCget_data_expected_from \ diff --git a/tests/mocks/valuecache/valuecache_mock.c b/tests/mocks/valuecache/valuecache_mock.c index f8564929d4f..323bc8fc773 100644 --- a/tests/mocks/valuecache/valuecache_mock.c +++ b/tests/mocks/valuecache/valuecache_mock.c @@ -54,6 +54,8 @@ int __wrap_zbx_history_get_values(zbx_uint64_t itemid, int value_type, int start int __wrap_zbx_history_add_values(const zbx_vector_ptr_t *history); int __wrap_zbx_history_sql_init(zbx_history_iface_t *hist, unsigned char value_type, char **error); int __wrap_zbx_history_elastic_init(zbx_history_iface_t *hist, unsigned char value_type, char **error); +void __wrap_zbx_elastic_version_extract(void); +int __wrap_zbx_elastic_version_get(void); time_t __wrap_time(time_t *ptr); void __wrap_zbx_timespec(zbx_timespec_t *ts); @@ -685,6 +687,15 @@ int __wrap_zbx_history_elastic_init(zbx_history_iface_t *hist, unsigned char val return SUCCEED; } +void __wrap_zbx_elastic_version_extract(void) +{ +} + +int __wrap_zbx_elastic_version_get(void) +{ + return ZBX_DBVERSION_UNDEFINED; +} + /* * cache allocator size limit handling */ |