diff options
| author | Andrejs Aire <git-no-reply@zabbix.com> | 2019-02-14 15:55:42 +0300 |
|---|---|---|
| committer | Andrejs Aire <git-no-reply@zabbix.com> | 2019-02-14 15:55:42 +0300 |
| commit | 3d1b793b2d7e9abebc15d826293f42a69184538d (patch) | |
| tree | 75245f00e7df999c580e4b7f173d21cf6e2318ce /tests/zabbix_server/preprocessor | |
| parent | 21c9ae3a39807e462505784a4cb464749f791f45 (diff) | |
| parent | fa6765ead63fe32171246d701b75ab5a3222b87c (diff) | |
.......... [ZBXNEXT-4865] pulled changes from trunk
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 445de4f3d5e..811bc99d9b8 100644 --- a/tests/zabbix_server/preprocessor/Makefile.am +++ b/tests/zabbix_server/preprocessor/Makefile.am @@ -18,6 +18,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 756fb608639..031dea56453 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")) @@ -170,7 +173,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; @@ -193,8 +196,6 @@ void zbx_mock_test_entry(void **state) history_ts.ns = 0; } - history_value_copy = history_value; - returned_ret = zbx_item_preproc(0, value_type, &value, &ts, &op, &history_value, &history_ts, &error); if (SUCCEED == is_step_supported(op.type)) @@ -244,7 +245,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); } |