summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-30 18:47:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-30 18:47:05 +0000
commit97e01009d69b8fbebfebf68f51e3d126d0ed43fc (patch)
tree02e8b836c3a9d89806f3e67d4a5fe9f52dbb0061 /tests
parentReleasing debian version 1.36.1-1. (diff)
downloadnetdata-97e01009d69b8fbebfebf68f51e3d126d0ed43fc.tar.xz
netdata-97e01009d69b8fbebfebf68f51e3d126d0ed43fc.zip
Merging upstream version 1.37.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am32
-rw-r--r--tests/alarm_repetition/netdata.conf_with_repetition2
-rw-r--r--tests/alarm_repetition/netdata.conf_without_repetition2
-rw-r--r--tests/profile/benchmark-dictionary.c4
4 files changed, 20 insertions, 20 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb8b5e26..eb19512d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,32 +4,32 @@ AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = \
- health_mgmtapi/health-cmdapi-test.sh \
- acls/acl.sh \
- urls/request.sh \
- alarm_repetition/alarm.sh \
- template_dimension/template_dim.sh \
+ $(srcdir)/health_mgmtapi/health-cmdapi-test.sh \
+ $(srcdir)/acls/acl.sh \
+ $(srcdir)/urls/request.sh \
+ $(srcdir)/alarm_repetition/alarm.sh \
+ $(srcdir)/template_dimension/template_dim.sh \
$(NULL)
include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
dist_noinst_DATA = \
- health_mgmtapi/health-cmdapi-test.sh.in \
- acls/acl.sh.in \
- urls/request.sh.in \
- alarm_repetition/alarm.sh.in \
- template_dimension/template_dim.sh.in \
+ $(srcdir)/health_mgmtapi/health-cmdapi-test.sh.in \
+ $(srcdir)/acls/acl.sh.in \
+ $(srcdir)/urls/request.sh.in \
+ $(srcdir)/alarm_repetition/alarm.sh.in \
+ $(srcdir)/template_dimension/template_dim.sh.in \
$(NULL)
dist_plugins_SCRIPTS = \
- health_mgmtapi/health-cmdapi-test.sh \
- acls/acl.sh \
- urls/request.sh \
- alarm_repetition/alarm.sh \
- template_dimension/template_dim.sh \
+ $(srcdir)/health_mgmtapi/health-cmdapi-test.sh \
+ $(srcdir)/acls/acl.sh \
+ $(srcdir)/urls/request.sh \
+ $(srcdir)/alarm_repetition/alarm.sh \
+ $(srcdir)/template_dimension/template_dim.sh \
$(NULL)
dist_noinst_SCRIPTS = \
- stress.sh \
+ $(srcdir)/stress.sh \
$(NULL)
diff --git a/tests/alarm_repetition/netdata.conf_with_repetition b/tests/alarm_repetition/netdata.conf_with_repetition
index dc3aef39..ddee852f 100644
--- a/tests/alarm_repetition/netdata.conf_with_repetition
+++ b/tests/alarm_repetition/netdata.conf_with_repetition
@@ -52,4 +52,4 @@
allow from = *
[cloud]
- cloud base url = https://app.netdata.cloud
+ cloud base url = https://api.netdata.cloud
diff --git a/tests/alarm_repetition/netdata.conf_without_repetition b/tests/alarm_repetition/netdata.conf_without_repetition
index 27c7b86f..7add0328 100644
--- a/tests/alarm_repetition/netdata.conf_without_repetition
+++ b/tests/alarm_repetition/netdata.conf_without_repetition
@@ -52,4 +52,4 @@
allow from = *
[cloud]
- cloud base url = https://app.netdata.cloud
+ cloud base url = https://api.netdata.cloud
diff --git a/tests/profile/benchmark-dictionary.c b/tests/profile/benchmark-dictionary.c
index 30c098d5..7cc9ab0a 100644
--- a/tests/profile/benchmark-dictionary.c
+++ b/tests/profile/benchmark-dictionary.c
@@ -19,8 +19,8 @@ void netdata_cleanup_and_exit(int ret) { exit(ret); }
int main(int argc, char **argv) {
if(argc || argv) {;}
-// DICTIONARY *dict = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED|DICTIONARY_FLAG_WITH_STATISTICS);
- DICTIONARY *dict = dictionary_create(DICTIONARY_FLAG_WITH_STATISTICS);
+// DICTIONARY *dict = dictionary_create(DICT_OPTION_SINGLE_THREADED|DICT_OPTION_WITH_STATISTICS);
+ DICTIONARY *dict = dictionary_create(DICT_OPTION_STATS);
if(!dict) fatal("Cannot create dictionary.");
struct rusage start, end;