diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2019-03-01 13:41:33 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2019-03-01 13:41:33 +0300 |
| commit | 0fa2fd54942b2969ff178a447ddd92a730ec39ef (patch) | |
| tree | 65ed575f3cbd6052829a93abb7ede9a196224dd7 /tests/zabbix_server/preprocessor | |
| parent | b69bbca77237854bcd01482a7e2aeafc83b5792b (diff) | |
| parent | 5914e4987f627e054ba1eeb95c2723de6a595829 (diff) | |
.......... [ZBXNEXT-5016] merged from upstream
Diffstat (limited to 'tests/zabbix_server/preprocessor')
| -rw-r--r-- | tests/zabbix_server/preprocessor/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/zabbix_server/preprocessor/zbx_item_preproc.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/zabbix_server/preprocessor/Makefile.am b/tests/zabbix_server/preprocessor/Makefile.am index 45b52ee8a26..d569898c7d5 100644 --- a/tests/zabbix_server/preprocessor/Makefile.am +++ b/tests/zabbix_server/preprocessor/Makefile.am @@ -17,6 +17,7 @@ JSON_LIBS = \ $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ + $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ $(top_srcdir)/tests/libzbxmockdata.a zbx_item_preproc_SOURCES = \ diff --git a/tests/zabbix_server/preprocessor/zbx_item_preproc.c b/tests/zabbix_server/preprocessor/zbx_item_preproc.c index de7d1620e5d..dd8191c5a91 100644 --- a/tests/zabbix_server/preprocessor/zbx_item_preproc.c +++ b/tests/zabbix_server/preprocessor/zbx_item_preproc.c @@ -25,9 +25,12 @@ #include "common.h" #include "zbxjson.h" #include "dbcache.h" +#include "zbxembed.h" #include "../../../src/zabbix_server/preprocessor/item_preproc.h" +zbx_es_t es_engine; + static int str_to_preproc_type(const char *str) { if (0 == strcmp(str, "ZBX_PREPROC_MULTIPLIER")) @@ -166,7 +169,7 @@ static int is_step_supported(int type) void zbx_mock_test_entry(void **state) { - zbx_variant_t value, history_value, history_value_copy; + zbx_variant_t value, history_value; unsigned char value_type; zbx_timespec_t ts, history_ts, expected_history_ts; zbx_preproc_op_t op; @@ -189,8 +192,6 @@ void zbx_mock_test_entry(void **state) history_ts.ns = 0; } - history_value_copy = history_value; - returned_ret = zbx_item_preproc(value_type, &value, &ts, &op, &history_value, &history_ts, &action, &error); if (SUCCEED == is_step_supported(op.type)) @@ -240,7 +241,6 @@ void zbx_mock_test_entry(void **state) zbx_variant_clear(&value); zbx_variant_clear(&history_value); - zbx_variant_clear(&history_value_copy); zbx_free(error); } |