diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2019-07-16 10:34:45 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2019-07-16 10:37:41 +0300 |
| commit | c9de6ac944bc97fcc909a5236752d3ef2646dedb (patch) | |
| tree | 467e7e4cab9ef12df492f65eecb84daaae54a928 /tests/libs/zbxsysinfo/Makefile.am | |
| parent | cb86eb2989f33855f88c25efd7d29bd2b7d5bf25 (diff) | |
.......PS. [ZBXNEXT-4502] added support of full jsonpath functionality
* commit 'e40b4995d877edebae4404ee4056df2b7d9ced72': (61 commits)
.......PS. [ZBXNEXT-4502] fixed jsonpath expression evaluation when checking for presence of an object or array
.......PS. [ZBXNEXT-4502] applied patch for adding sum() function support in jsonpath queries
.......PS. [ZBXNEXT-4502] fixed jsonpath queries for element existance when element value was string
.......PS. [ZBXNEXT-4502] fixed jsonpath function parsing when compiling jsonpath
.......PS. [ZBXNEXT-4502] removed duplicated function declaration
.......PS. [ZBXNEXT-4502] updated replaced deprecated zbx_json_open_path in 4.2 code with zbx_jsonpath_query, fixed merge
...G...... [ZBXNEXT-4502] fixed windows build
.......PS. [ZBXNEXT-4502] renamed zbx_json_path_open() to zbx_json_open_path()
.......PS. [ZBXNEXT-4502] fixed test case name
.......PS. [ZBXNEXT-4502] fixed comments
.......PS. [ZBXNEXT-4502] refactored jsonpath expression evaluation to avoid false positive analyzer warnings
...G...PS. [ZBXNEXT-4502] fixed coding style
...G...PS. [ZBXNEXT-4502] added more variant comparison test cases
...G...PS. [ZBXNEXT-4502] fixed coding style
...G...PS. [ZBXNEXT-4502] - changed json static error message buffer to thread local for windows
...G...PS. [ZBXNEXT-4502] improved comments
...G...PS. [ZBXNEXT-4502] fixed coding style: * reduced local variable scope * improved error message
...G...PS. [ZBXNEXT-4502] refactored zbx_jsonpath_compile() to avoid touching the output structure if the compilation failed Also fixed various coding style issues.
...G...PS. [ZBXNEXT-4502] fixed memory leak
...G...PS. [ZBXNEXT-4502] fixed coding style: * reduced local variable scope * use sizoef instead of 4 when copying integer variable contents * fixed comments
...
(cherry picked from commit 8ceddc49ebcb31e1be87dd1a948b9f827615b1db)
Diffstat (limited to 'tests/libs/zbxsysinfo/Makefile.am')
| -rw-r--r-- | tests/libs/zbxsysinfo/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am index c1d29c7cd0e..09a946d78c3 100644 --- a/tests/libs/zbxsysinfo/Makefile.am +++ b/tests/libs/zbxsysinfo/Makefile.am @@ -58,6 +58,7 @@ parse_item_key_LDADD = \ $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ $(top_srcdir)/src/libs/zbxmedia/libzbxmedia.a \ + $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ @@ -65,7 +66,6 @@ parse_item_key_LDADD = \ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ $(top_srcdir)/src/libs/zbxcommshigh/libzbxcommshigh.a \ - $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ $(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ @@ -106,9 +106,9 @@ process_LDADD = \ $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ + $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ - $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \ $(top_srcdir)/src/zabbix_agent/libzbxagent.a \ |