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
path: root/tests
diff options
context:
space:
mode:
authorVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2022-01-20 19:12:31 +0300
committerVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2022-01-20 19:12:31 +0300
commit8581f78a4716146700c8e7e04c0871c0ea92dcb1 (patch)
tree245120968727dd2fe835d1da32e0fca4ac24304f /tests
parente9c204433add1e942e52ebfae4fa87942f2baf47 (diff)
.......PS. [ZBXNEXT-7402] fixed tests
Diffstat (limited to 'tests')
-rw-r--r--tests/libs/zbxdbcache/Makefile.am6
-rw-r--r--tests/libs/zbxdbhigh/Makefile.am3
-rwxr-xr-xtests/libs/zbxeval/Makefile.am3
-rwxr-xr-xtests/libs/zbxserver/Makefile.am3
-rw-r--r--tests/zabbix_server/service/Makefile.am3
-rw-r--r--tests/zbxmocktest.c6
6 files changed, 21 insertions, 3 deletions
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 2eadda645b8..3b9a934cb73 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -30,6 +30,9 @@ VALUECACHE_LIBS = \
$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
$(top_srcdir)/tests/mocks/valuecache/libvaluecachemock.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
$(top_srcdir)/tests/libzbxmockdata.a \
$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
@@ -76,6 +79,9 @@ CACHE_LIBS = \
$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
$(top_srcdir)/tests/libzbxmocktest.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
$(top_srcdir)/tests/libzbxmockdata.a
diff --git a/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am
index 685190bb75e..7210c0975a6 100644
--- a/tests/libs/zbxdbhigh/Makefile.am
+++ b/tests/libs/zbxdbhigh/Makefile.am
@@ -41,6 +41,9 @@ COMMON_LIB = \
$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
diff --git a/tests/libs/zbxeval/Makefile.am b/tests/libs/zbxeval/Makefile.am
index b1bea8d1259..9d859488d39 100755
--- a/tests/libs/zbxeval/Makefile.am
+++ b/tests/libs/zbxeval/Makefile.am
@@ -86,6 +86,9 @@ COMMON_LIB_FILES = \
$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a
COMMON_COMPILER_FLAGS = -I@top_srcdir@/tests
diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index fbf6ce93814..a71095f5f9d 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -108,6 +108,9 @@ COMMON_LIB_FILES = \
$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a
diff --git a/tests/zabbix_server/service/Makefile.am b/tests/zabbix_server/service/Makefile.am
index f9b85c60d95..7bef71d44f1 100644
--- a/tests/zabbix_server/service/Makefile.am
+++ b/tests/zabbix_server/service/Makefile.am
@@ -49,6 +49,9 @@ COMMON_LIBS = \
$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
$(top_srcdir)/tests/libzbxmocktest.a \
$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
+ $(top_builddir)/src/libs/zbxcyberark/libzbxcyberark.a \
+ $(top_builddir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
+ $(top_builddir)/src/libs/zbxkvs/libzbxkvs.a \
$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
$(top_srcdir)/tests/libzbxmockdata.a
diff --git a/tests/zbxmocktest.c b/tests/zbxmocktest.c
index 9189dfeb4fd..190fc7df3f2 100644
--- a/tests/zbxmocktest.c
+++ b/tests/zbxmocktest.c
@@ -102,10 +102,10 @@ char *CONFIG_DBSCHEMA = NULL;
char *CONFIG_DBUSER = NULL;
char *CONFIG_DBPASSWORD = NULL;
char *CONFIG_VAULT = NULL;
-char *CONFIG_VAULTTOKEN = NULL;
-char *CONFIG_VAULTLSCERTFILE = NULL;
-char *CONFIG_VAULTLSKEYFILE = NULL;
char *CONFIG_VAULTURL = NULL;
+char *CONFIG_VAULTTOKEN = NULL;
+char *CONFIG_VAULTTLSCERTFILE = NULL;
+char *CONFIG_VAULTTLSKEYFILE = NULL;
char *CONFIG_VAULTDBPATH = NULL;
char *CONFIG_DBSOCKET = NULL;
char *CONFIG_DB_TLS_CONNECT = NULL;