Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiks Kronkalns <miks.kronkalns@zabbix.com>2019-06-17 08:37:48 +0300
committerMiks Kronkalns <miks.kronkalns@zabbix.com>2019-06-17 08:39:09 +0300
commiteec13cafe379634b3213a9bc9982223d9ffa6bc1 (patch)
treec4fc62c5de220745f5abcccbc04d6ac57ab6f967 /tests/zabbix_server/trapper/Makefile.am
parent0375b09191c98206eb90297633ba4b172b909292 (diff)
..F.....S. [ZBXNEXT-5124,ZBX-15827] extended preprocessing steps with final result row; improved input validation in preprocessing steps
* commit 'b0aa9ec70687c15167a5d3c1fd7416a12237017f': (27 commits) .......... [ZBX-15827,ZBXNEXT-5124] fixed changelog .......... [ZBX-15827,ZBXNEXT-5124] fixed changelog .......... [ZBX-15827,ZBXNEXT-5124] fixed changelog ..F....... [ZBXNEXT-5124,ZBX-15827] removed unexplainable click on action link elements once preprocessing results are received ..F....... [ZBXNEXT-5124,ZBX-15827] fixed error displaying in preprocessing steps test dialog when test is performed with invalid previous value ..F....... [ZBX-15827] made 'test all steps' button visible starting from 1 preprocessing step ..F....... [ZBX-15827,ZBXNEXT-5124] fixed coding style ..F....... [ZBX-15827,ZBXNEXT-5124] implemented final result handling in frontend preprocessing test dialog .......PS. [ZBX-15827] fixed crash in case of timeout ...G...PS. [ZBX-15827] fixed "null pointer passed as argument" error ...G...PS. [ZBX-15827] fixed "shadows a previous local" warning ...G...PS. [ZBX-15827] fixed may be used uninitialized warning ...G...PS. [ZBX-15827] fixed indentation ...G...PS. [ZBX-15827] reduced number of variables ...G...PS. [ZBX-15827] removed redundant variable initialization ...G...PS. [ZBX-15827] fixed key parsing not to allow null and boolean .......... [ZBX-15827] fixed memory leaks in cmocka tests ........S. [ZBX-15827] fixed memory leak when parsing incomplete test requests .......PS. [ZBX-15827] refactored json parsing api to return json object type instead of is_null flag ........S. [ZBX-15827] added tests for preprocessing testing ... (cherry picked from commit bff82423f01f1b965b2a564819851f8f151d13f9)
Diffstat (limited to 'tests/zabbix_server/trapper/Makefile.am')
-rw-r--r--tests/zabbix_server/trapper/Makefile.am49
1 files changed, 49 insertions, 0 deletions
diff --git a/tests/zabbix_server/trapper/Makefile.am b/tests/zabbix_server/trapper/Makefile.am
new file mode 100644
index 00000000000..22650e761d4
--- /dev/null
+++ b/tests/zabbix_server/trapper/Makefile.am
@@ -0,0 +1,49 @@
+if SERVER
+SERVER_tests = zbx_trapper_preproc_test_run
+
+noinst_PROGRAMS = $(SERVER_tests)
+
+COMMON_SRC_FILES = \
+ ../../zbxmocktest.h
+
+TRAPPER_LIBS = \
+ $(top_srcdir)/tests/libzbxmocktest.a \
+ $(top_srcdir)/tests/libzbxmockdata.a \
+ $(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
+ $(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
+ $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+ $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
+ $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+ $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+ $(top_srcdir)/src/libs/zbxcommshigh/libzbxcommshigh.a \
+ $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
+ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+ $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
+ $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+ $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+ $(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)/src/libs/zbxprometheus/libzbxprometheus.a \
+ $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
+ $(top_srcdir)/tests/libzbxmockdata.a
+
+zbx_trapper_preproc_test_run_SOURCES = \
+ zbx_trapper_preproc_test_run.c \
+ ../../../src/zabbix_server/trapper/trapper_preproc.c \
+ ../../zbxmockjson.c
+
+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@ \
+ -Wl,--wrap=zbx_preprocessor_test \
+ -Wl,--wrap=DBget_user_by_active_session
+
+endif
+