diff options
| author | Mārtiņš Tālbergs <martins.talbergs@zabbix.com> | 2020-12-16 12:05:34 +0300 |
|---|---|---|
| committer | Mārtiņš Tālbergs <martins.talbergs@zabbix.com> | 2020-12-16 14:13:04 +0300 |
| commit | a944b7aeb47263eb640389eeb9b6a02c3533502e (patch) | |
| tree | a461fb13cada78250f881b17579dfb0105cefc89 /tests/zabbix_server | |
| parent | c0a76ce588c3124cdb47cb26bcde9de51f257ef1 (diff) | |
| parent | 21172907e8f69a310035e4efcce1346e2b1c3a4f (diff) | |
.......... [ZBXNEXT-6207] updated to latest from ^origin/master
Conflicts:
create/src/schema.tmpl
src/libs/zbxdbupgrade/dbupgrade_5030.c
ui/app/controllers/CControllerUserroleEdit.php
ui/include/classes/api/CAudit.php
ui/include/classes/helpers/CRoleHelper.php
ui/include/defines.inc.php
Diffstat (limited to 'tests/zabbix_server')
| -rw-r--r-- | tests/zabbix_server/trapper/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/zabbix_server/trapper/Makefile.am b/tests/zabbix_server/trapper/Makefile.am index 5b9d49d6bc8..1b8f68d4954 100644 --- a/tests/zabbix_server/trapper/Makefile.am +++ b/tests/zabbix_server/trapper/Makefile.am @@ -39,13 +39,12 @@ zbx_trapper_preproc_test_run_SOURCES = \ zbx_trapper_preproc_test_run_LDADD = $(TRAPPER_LIBS) zbx_trapper_preproc_test_run_LDADD += @SERVER_LIBS@ -zbx_trapper_preproc_test_run_LDFLAGS = @SERVER_LDFLAGS@ - -zbx_trapper_preproc_test_run_CFLAGS = \ - -I@top_srcdir@/tests @LIBXML2_CFLAGS@ \ +zbx_trapper_preproc_test_run_LDFLAGS = @SERVER_LDFLAGS@ \ -Wl,--wrap=zbx_preprocessor_test \ -Wl,--wrap=DBget_user_by_active_session \ -Wl,--wrap=DBget_user_by_auth_token +zbx_trapper_preproc_test_run_CFLAGS = \ + -I@top_srcdir@/tests @LIBXML2_CFLAGS@ endif diff --git a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c index 4251f28fc58..ab95f2cf522 100644 --- a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c +++ b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c @@ -37,6 +37,12 @@ zbx_es_t es_engine; int __wrap_zbx_preprocessor_test(unsigned char value_type, const char *value, const zbx_timespec_t *ts, const zbx_vector_ptr_t *steps, zbx_vector_ptr_t *results, zbx_vector_ptr_t *history, + char **preproc_error, char **error); + +int __wrap_DBget_user_by_active_session(const char *sessionid, zbx_user_t *user); + +int __wrap_zbx_preprocessor_test(unsigned char value_type, const char *value, const zbx_timespec_t *ts, + const zbx_vector_ptr_t *steps, zbx_vector_ptr_t *results, zbx_vector_ptr_t *history, char **preproc_error, char **error) { int i, results_num; |