From: Florian Forster <octo@collectd.org>
Date: Sun, 10 Feb 2019 20:44:20 +0000 (+0100)
Subject: Merge branch 'collectd-5.7' into collectd-5.8
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2700666217249cd4794dfc17b4ac3b28f3dca56b

Merge branch 'collectd-5.7' into collectd-5.8
---

2700666217249cd4794dfc17b4ac3b28f3dca56b
diff --cc src/daemon/common_test.c
index af2840e5,7a9f9142..93a19d1b
--- a/src/daemon/common_test.c
+++ b/src/daemon/common_test.c
@@@ -168,12 -185,14 +168,14 @@@ DEF_TEST(strjoin) 
                       cases[i].fields_num, cases[i].separator);
      EXPECT_EQ_INT(cases[i].want_return, status);
      EXPECT_EQ_STR(cases[i].want_buffer, buffer);
-   }
  
-   /* use (NULL, 0) to determine required buffer size. */
-   EXPECT_EQ_INT(3, strjoin(NULL, 0, (char *[]){"a", "b"}, 2, "-"));
+     /* use (NULL, 0) to determine required buffer size. */
+     EXPECT_EQ_INT(cases[i].want_return,
+                   strjoin(NULL, 0, cases[i].fields, cases[i].fields_num,
+                           cases[i].separator));
+   }
  
 -  return (0);
 +  return 0;
  }
  
  DEF_TEST(escape_slashes) {